diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml
index f40f044586c88..f347958e8b4ae 100644
--- a/.github/workflows/install-testing.yml
+++ b/.github/workflows/install-testing.yml
@@ -90,11 +90,13 @@ jobs:
             db-version: '8.4'
           - php: '7.3'
             db-version: '8.4'
+          # Only test the latest innovation release.
+          - db-version: '9.0'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.0'
+            db-version: '9.1'
           - php: '7.3'
-            db-version: '9.0'
+            db-version: '9.1'
 
     services:
       database:
diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml
index 17d078198c009..09b212e90ead5 100644
--- a/.github/workflows/local-docker-environment.yml
+++ b/.github/workflows/local-docker-environment.yml
@@ -90,11 +90,13 @@ jobs:
         exclude:
           # MySQL containers <= 5.5 do not exist or fail to start properly.
           - db-version: '5.5'
+          # Only test the latest innovation release.
+          - db-version: '9.0'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.0'
+            db-version: '9.1'
           - php: '7.3'
-            db-version: '9.0'
+            db-version: '9.1'
 
     with:
       os: ${{ matrix.os }}
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index dba6091a5547a..dbb672a30da39 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -32,7 +32,7 @@ permissions: {}
 jobs:
   # Runs the performance test suite.
   performance:
-    name: Performance tests ${{ matrix.memcached && '(with memcached)' || '' }}
+    name: ${{ matrix.multisite && 'Multisite' || 'Single site' }}
     uses: WordPress/wordpress-develop/.github/workflows/reusable-performance.yml@trunk
     permissions:
       contents: read
@@ -41,8 +41,10 @@ jobs:
       fail-fast: false
       matrix:
         memcached: [ true, false ]
+        multisite: [ true, false ]
     with:
       memcached: ${{ matrix.memcached }}
+      multisite: ${{ matrix.multisite }}
     secrets:
       CODEVITALS_PROJECT_TOKEN: ${{ secrets.CODEVITALS_PROJECT_TOKEN }}
 
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 3ea45fcdc331e..3fe069b709fea 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -47,7 +47,7 @@ jobs:
         os: [ ubuntu-latest ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.0' ]
+        db-version: [ '5.7', '8.0', '8.4' ]
         tests-domain: [ 'example.org' ]
         multisite: [ false, true ]
         memcached: [ false ]
@@ -91,14 +91,6 @@ jobs:
             multisite: false
             memcached: false
             report: true
-
-        exclude:
-          # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
-          - php: '7.2'
-            db-version: '9.0'
-          - php: '7.3'
-            db-version: '9.0'
-
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -126,7 +118,7 @@ jobs:
         os: [ ubuntu-latest ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mariadb' ]
-        db-version: [ '10.4', '10.6', '10.11', '11.2' ]
+        db-version: [ '5.5', '10.3', '10.4', '10.5', '10.6', '10.11', '11.4' ]
         multisite: [ false, true ]
         memcached: [ false ]
 
@@ -135,13 +127,13 @@ jobs:
         - os: ubuntu-latest
           php: '8.3'
           db-type: 'mariadb'
-          db-version: '11.2'
+          db-version: '11.4'
           multisite: false
           memcached: true
         - os: ubuntu-latest
           php: '8.3'
           db-type: 'mariadb'
-          db-version: '11.2'
+          db-version: '11.4'
           multisite: true
           memcached: true
     with:
@@ -154,6 +146,55 @@ jobs:
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
       report: ${{ matrix.report || false }}
 
+  #
+  # Creates PHPUnit test jobs to test MariaDB and MySQL innovation releases.
+  #
+  # Though innovation releases are deemed "production grade" and never receive LTS status, they include new features
+  # and updates that will be included in the next LTS version.
+  #
+  # Because upstream support for innovation releases gets dropped when a new one is released, only the most recent
+  # innovation version is tested.
+  #
+  test-innovation-releases:
+    name: PHP ${{ matrix.php }}
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.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.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        db-type: [ 'mysql', 'mariadb' ]
+        db-version: [ '9.1', '11.6' ]
+        multisite: [ false, true ]
+        memcached: [ false ]
+        db-innovation: [ true ]
+
+        exclude:
+          # MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
+          - php: '7.2'
+            db-version: '9.1'
+          - php: '7.3'
+            db-version: '9.1'
+          # Exclude version combinations that don't exist.
+          - db-type: 'mariadb'
+            db-version: '9.1'
+          - db-type: 'mysql'
+            db-version: '11.6'
+    with:
+      os: ${{ matrix.os }}
+      php: ${{ matrix.php }}
+      db-type: ${{ matrix.db-type }}
+      db-version: ${{ matrix.db-version }}
+      db-innovation: ${{ matrix.db-innovation }}
+      multisite: ${{ matrix.multisite }}
+      memcached: ${{ matrix.memcached }}
+      phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
+      report: ${{ matrix.report || false }}
+
   #
   # Runs specific individual test groups.
   #
@@ -183,7 +224,7 @@ jobs:
     permissions:
       actions: read
       contents: read
-    needs: [ test-with-mysql, test-with-mariadb, specific-test-groups ]
+    needs: [ test-with-mysql, test-with-mariadb, test-innovation-releases, specific-test-groups ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
       calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}
diff --git a/.github/workflows/reusable-performance.yml b/.github/workflows/reusable-performance.yml
index e5c29aa0b1849..f75cb6b3e4969 100644
--- a/.github/workflows/reusable-performance.yml
+++ b/.github/workflows/reusable-performance.yml
@@ -1,7 +1,7 @@
 ##
 # A reusable workflow that runs the performance test suite.
 ##
-name: Performance Tests
+name: Run performance Tests
 
 on:
   workflow_call:
@@ -26,6 +26,11 @@ on:
         required: false
         type: 'boolean'
         default: false
+      multisite:
+        description: 'Whether to use Multisite.'
+        required: false
+        type: 'boolean'
+        default: false
     secrets:
       CODEVITALS_PROJECT_TOKEN:
         description: 'The authorization token for https://www.codevitals.run/project/wordpress.'
@@ -53,6 +58,7 @@ env:
 
   LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }}
   LOCAL_PHP: ${{ inputs.php-version }}${{ 'latest' != inputs.php-version && '-fpm' || '' }}
+  LOCAL_MULTISITE: ${{ inputs.multisite }}
 
 jobs:
   # Performs the following steps:
@@ -65,9 +71,11 @@ jobs:
   # - Install Playwright browsers.
   # - Build WordPress.
   # - Start Docker environment.
+  # - Install object cache drop-in.
   # - Log running Docker containers.
   # - Docker debug information.
   # - Install WordPress.
+  # - Enable themes on Multisite.
   # - Install WordPress Importer plugin.
   # - Import mock data.
   # - Deactivate WordPress Importer plugin.
@@ -98,7 +106,7 @@ jobs:
   # - Publish performance results.
   # - Ensure version-controlled files are not modified or deleted.
   performance:
-    name: Run tests
+    name: ${{ inputs.multisite && 'Multisite' || 'Single site' }} / ${{ inputs.memcached && 'Memcached' || 'Default' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -166,6 +174,14 @@ jobs:
       - name: Install WordPress
         run: npm run env:install
 
+      - name: Enable themes on Multisite
+        if: ${{ inputs.multisite }}
+        run: |
+          npm run env:cli -- theme enable twentytwentyone --network --path=/var/www/${{ env.LOCAL_DIR }}
+          npm run env:cli -- theme enable twentytwentythree --network --path=/var/www/${{ env.LOCAL_DIR }}
+          npm run env:cli -- theme enable twentytwentyfour --network --path=/var/www/${{ env.LOCAL_DIR }}
+          npm run env:cli -- theme enable twentytwentyfive --network --path=/var/www/${{ env.LOCAL_DIR }}
+
       - name: Install WordPress Importer plugin
         run: npm run env:cli -- plugin install wordpress-importer --activate --path=/var/www/${{ env.LOCAL_DIR }}
 
@@ -290,7 +306,7 @@ jobs:
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         if: always()
         with:
-          name: performance-artifacts${{ inputs.memcached && '-memcached' || '' }}-${{ github.run_id }}
+          name: performance-artifacts${{ inputs.multisite && '-multisite' || '' }}${{ inputs.memcached && '-memcached' || '' }}-${{ github.run_id }}
           path: artifacts
           if-no-files-found: ignore
           include-hidden-files: true
@@ -303,7 +319,7 @@ jobs:
 
       - name: Set the base sha
         # Only needed when publishing results.
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached && ! inputs.multisite }}
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         id: base-sha
         with:
@@ -314,21 +330,15 @@ jobs:
 
       - name: Set commit details
         # Only needed when publishing results.
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.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))
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached && ! inputs.multisite }}
+        # Write to an environment variable to have the output available in later steps of the job.
+        run: echo "COMMITTED_AT=$(git show -s $GITHUB_SHA --format='%cI')" >> $GITHUB_ENV
 
       - name: Publish performance results
         # Only publish results on pushes to trunk.
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached && ! inputs.multisite }}
         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: |
diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml
index cac3015af383a..3d26efa7026b2 100644
--- a/.github/workflows/reusable-phpunit-tests-v3.yml
+++ b/.github/workflows/reusable-phpunit-tests-v3.yml
@@ -27,6 +27,11 @@ on:
         required: false
         type: 'string'
         default: '8.4'
+      db-innovation:
+        description: 'Whether a database software innovation release is being tested.'
+        required: false
+        type: 'boolean'
+        default: false
       multisite:
         description: 'Whether to run tests as multisite'
         required: false
@@ -105,7 +110,7 @@ jobs:
   # - Checks out the WordPress Test reporter repository.
   # - Submit the test results to the WordPress.org host test results.
   phpunit-tests:
-    name: ${{ inputs.phpunit-test-groups && format( '{0} / ', inputs.phpunit-test-groups ) || '' }}PHP ${{ inputs.php }} ${{ ! inputs.phpunit-test-groups && ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
+    name: ${{ inputs.phpunit-test-groups && format( '{0} / ', inputs.phpunit-test-groups ) || '' }}PHP ${{ inputs.php }} ${{ ! inputs.phpunit-test-groups && ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
     runs-on: ${{ inputs.os }}
     timeout-minutes: ${{ inputs.coverage-report && 120 || 20 }}
 
diff --git a/.version-support-mysql.json b/.version-support-mysql.json
index f6cffac449cae..8616ffb294e43 100644
--- a/.version-support-mysql.json
+++ b/.version-support-mysql.json
@@ -1,5 +1,6 @@
 {
 	"6-8": [
+		"9.1",
 		"9.0",
 		"8.4",
 		"8.0",
diff --git a/src/wp-admin/css/about.css b/src/wp-admin/css/about.css
index 79f0254ad33b8..70af0337307ab 100644
--- a/src/wp-admin/css/about.css
+++ b/src/wp-admin/css/about.css
@@ -454,7 +454,12 @@
 }
 
 .about__section a.button.button-hero {
+	padding-top: 1.1875rem;
+	padding-bottom: 1.1875rem;
 	font-size: 1.5rem;
+	line-height: 1.4;
+	white-space: normal;
+	text-wrap: pretty;
 }
 
 .about__container ul {
diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
index c93d98a169849..82543f6219f85 100644
--- a/src/wp-admin/network/settings.php
+++ b/src/wp-admin/network/settings.php
@@ -405,7 +405,7 @@
 			<tr>
 				<th scope="row"><?php _e( 'Site upload space' ); ?></th>
 				<td>
-					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ); ?>/>
+					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ); ?> />
 						<?php
 						printf(
 							/* translators: %s: Number of megabytes to limit uploads to. */
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index d9e084d14383b..6bb8ce2f54acc 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -90,7 +90,7 @@
 <ul>
 	<li>
 		<label for="close_comments_days_old"><?php _e( 'Close comments when post is how many days old' ); ?></label>
-		<input name="close_comments_days_old" type="number" step="1" min="0" id="close_comments_days_old" value="<?php echo esc_attr( get_option( 'close_comments_days_old' ) ); ?>" class="small-text"/>
+		<input name="close_comments_days_old" type="number" step="1" min="0" id="close_comments_days_old" value="<?php echo esc_attr( get_option( 'close_comments_days_old' ) ); ?>" class="small-text" />
 	</li>
 </ul>
 
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index ce814c9d3891e..b2eb47c4f402a 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -70,7 +70,7 @@
 <label for="thumbnail_size_h"><?php _e( 'Height' ); ?></label>
 <input name="thumbnail_size_h" type="number" step="1" min="0" id="thumbnail_size_h" value="<?php form_option( 'thumbnail_size_h' ); ?>" class="small-text" />
 </fieldset>
-<input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked( '1', get_option( 'thumbnail_crop' ) ); ?>/>
+<input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1"<?php checked( '1', get_option( 'thumbnail_crop' ) ); ?> />
 <label for="thumbnail_crop"><?php _e( 'Crop thumbnail to exact dimensions (normally thumbnails are proportional)' ); ?></label>
 </td>
 </tr>
diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
index 2d1ff715d3d23..d2fa4ae8ea7ee 100644
--- a/src/wp-admin/setup-config.php
+++ b/src/wp-admin/setup-config.php
@@ -227,7 +227,7 @@ function setup_config_display_header( $body_classes = array() ) {
 	<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><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>
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 8a5f813502b72..141b9d9f86a4c 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
@@ -682,7 +682,6 @@ hr.wp-block-separator.is-style-dots::before {
 
 .editor-styles-wrapper .wp-block-quote p {
 	color: inherit;
-	font-weight: 400;
 	margin: 0 0 20px 0;
 	letter-spacing: inherit;
 }
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 7f18f4772441e..862a51cc2b8e1 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
@@ -686,7 +686,6 @@ hr.wp-block-separator.is-style-dots::before {
 
 .editor-styles-wrapper .wp-block-quote p {
 	color: inherit;
-	font-weight: 400;
 	margin: 0 0 20px 0;
 	letter-spacing: inherit;
 }
diff --git a/src/wp-includes/class-wp-image-editor-imagick.php b/src/wp-includes/class-wp-image-editor-imagick.php
index dd8b9ad5191ee..edce8d2b7dcd9 100644
--- a/src/wp-includes/class-wp-image-editor-imagick.php
+++ b/src/wp-includes/class-wp-image-editor-imagick.php
@@ -484,7 +484,38 @@ protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIAN
 				$this->image->setOption( 'png:compression-filter', '5' );
 				$this->image->setOption( 'png:compression-level', '9' );
 				$this->image->setOption( 'png:compression-strategy', '1' );
-				$this->image->setOption( 'png:exclude-chunk', 'all' );
+				// Check to see if a PNG is indexed, and find the pixel depth.
+				if ( is_callable( array( $this->image, 'getImageDepth' ) ) ) {
+					$indexed_pixel_depth = $this->image->getImageDepth();
+
+					// Indexed PNG files get some additional handling.
+					if ( 0 < $indexed_pixel_depth && 8 >= $indexed_pixel_depth ) {
+						// Check for an alpha channel.
+						if (
+							is_callable( array( $this->image, 'getImageAlphaChannel' ) )
+							&& $this->image->getImageAlphaChannel()
+						) {
+							$this->image->setOption( 'png:include-chunk', 'tRNS' );
+						} else {
+							$this->image->setOption( 'png:exclude-chunk', 'all' );
+						}
+
+						// Reduce colors in the images to maximum needed, using the global colorspace.
+						$max_colors = pow( 2, $indexed_pixel_depth );
+						if ( is_callable( array( $this->image, 'getImageColors' ) ) ) {
+							$current_colors = $this->image->getImageColors();
+							$max_colors = min( $max_colors, $current_colors );
+						}
+						$this->image->quantizeImage( $max_colors, $this->image->getColorspace(), 0, false, false );
+
+						/**
+						 * If the colorspace is 'gray', use the png8 format to ensure it stays indexed.
+						 */
+						if ( Imagick::COLORSPACE_GRAY === $this->image->getImageColorspace() ) {
+							$this->image->setOption( 'png:format', 'png8' );
+						}
+					}
+				}
 			}
 
 			/*
@@ -503,11 +534,23 @@ protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIAN
 				}
 			}
 
-			// Limit the bit depth of resized images to 8 bits per channel.
+			// Limit the bit depth of resized images.
 			if ( is_callable( array( $this->image, 'getImageDepth' ) ) && is_callable( array( $this->image, 'setImageDepth' ) ) ) {
-				if ( 8 < $this->image->getImageDepth() ) {
-					$this->image->setImageDepth( 8 );
-				}
+				/**
+				 * Filters the maximum bit depth of resized images.
+				 *
+				 * This filter only applies when resizing using the Imagick editor since GD
+				 * does not support getting or setting bit depth.
+				 *
+				 * Use this to adjust the maximum bit depth of resized images.
+				 *
+				 * @since 6.8.0
+				 *
+				 * @param int $max_depth   The maximum bit depth. Default is the input depth.
+				 * @param int $image_depth The bit depth of the original image.
+				 */
+				$max_depth = apply_filters( 'image_max_bit_depth', $this->image->getImageDepth(), $this->image->getImageDepth() );
+				$this->image->setImageDepth( $max_depth );
 			}
 		} catch ( Exception $e ) {
 			return new WP_Error( 'image_resize_error', $e->getMessage() );
diff --git a/src/wp-includes/class-wp-locale-switcher.php b/src/wp-includes/class-wp-locale-switcher.php
index 9f1c4831ed446..db4ae298c69c0 100644
--- a/src/wp-includes/class-wp-locale-switcher.php
+++ b/src/wp-includes/class-wp-locale-switcher.php
@@ -273,11 +273,12 @@ private function load_translations( $locale ) {
 	 * @since 4.7.0
 	 *
 	 * @global WP_Locale $wp_locale WordPress date and time locale object.
+	 * @global PHPMailer\PHPMailer\PHPMailer $phpmailer
 	 *
 	 * @param string $locale The locale to change to.
 	 */
 	private function change_locale( $locale ) {
-		global $wp_locale;
+		global $wp_locale, $phpmailer;
 
 		$this->load_translations( $locale );
 
@@ -285,6 +286,10 @@ private function change_locale( $locale ) {
 
 		WP_Translation_Controller::get_instance()->set_locale( $locale );
 
+		if ( $phpmailer instanceof WP_PHPMailer ) {
+			$phpmailer->SetLanguage();
+		}
+
 		/**
 		 * Fires when the locale is switched to or restored.
 		 *
diff --git a/src/wp-includes/class-wp-oembed.php b/src/wp-includes/class-wp-oembed.php
index 5b699e9362c64..2d59c2217dc3e 100644
--- a/src/wp-includes/class-wp-oembed.php
+++ b/src/wp-includes/class-wp-oembed.php
@@ -110,6 +110,7 @@ public function __construct() {
 			'#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 ),
 			'#https?://bsky.app/profile/.*/post/.*#i'      => array( 'https://embed.bsky.app/oembed', true ),
+			'#https?://(www\.)?canva\.com/design/.*/view.*#i' => array( 'https://canva.com/_oembed', true ),
 		);
 
 		if ( ! empty( self::$early_providers['add'] ) ) {
@@ -190,6 +191,7 @@ public function __construct() {
 		 * | Crowdsignal  | crowdsignal.net                           | 6.2.0   |
 		 * | Anghami      | anghami.com                               | 6.3.0   |
 		 * | Bluesky      | bsky.app                                  | 6.6.0   |
+		 * | Canva        | canva.com                                 | 6.8.0   |
 		 *
 		 * No longer supported providers:
 		 *
diff --git a/src/wp-includes/class-wp-phpmailer.php b/src/wp-includes/class-wp-phpmailer.php
new file mode 100644
index 0000000000000..b3c976d13d9a6
--- /dev/null
+++ b/src/wp-includes/class-wp-phpmailer.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * WordPress PHPMailer class.
+ *
+ * @package WordPress
+ * @since 6.8.0
+ */
+
+/**
+ * WordPress PHPMailer class.
+ *
+ * Overrides the internationalization method in order to use WordPress' instead.
+ *
+ * @since 6.8.0
+ */
+class WP_PHPMailer extends PHPMailer\PHPMailer\PHPMailer {
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.8.0
+	 *
+	 * @param bool $exceptions Optional. Whether to throw exceptions for errors. Default false.
+	 */
+	public function __construct( $exceptions = false ) {
+		parent::__construct( $exceptions );
+		$this->SetLanguage();
+	}
+
+	/**
+	 * Defines the error messages using WordPress' internationalization method.
+	 *
+	 * @since 6.8.0
+	 *
+	 * @return true Always returns true.
+	 */
+	public function SetLanguage( $langcode = 'en', $lang_path = '' ) {
+		$error_strings  = array(
+			'authenticate'         => __( 'SMTP Error: Could not authenticate.' ),
+			'buggy_php'            => sprintf(
+				/* translators: 1: mail.add_x_header. 2: php.ini */
+				__(
+					'Your version of PHP is affected by a bug that may result in corrupted messages. To fix it, switch to sending using SMTP, disable the %1$s option in your %2$s, or switch to MacOS or Linux, or upgrade your PHP version.'
+				),
+				'mail.add_x_header',
+				'php.ini'
+			),
+			'connect_host'         => __( 'SMTP Error: Could not connect to SMTP host.' ),
+			'data_not_accepted'    => __( 'SMTP Error: data not accepted.' ),
+			'empty_message'        => __( 'Message body empty' ),
+			/* translators: There is a space after the colon. */
+			'encoding'             => __( 'Unknown encoding: ' ),
+			/* translators: There is a space after the colon. */
+			'execute'              => __( 'Could not execute: ' ),
+			/* translators: There is a space after the colon. */
+			'extension_missing'    => __( 'Extension missing: ' ),
+			/* translators: There is a space after the colon. */
+			'file_access'          => __( 'Could not access file: ' ),
+			/* translators: There is a space after the colon. */
+			'file_open'            => __( 'File Error: Could not open file: ' ),
+			/* translators: There is a space after the colon. */
+			'from_failed'          => __( 'The following From address failed: ' ),
+			'instantiate'          => __( 'Could not instantiate mail function.' ),
+			/* translators: There is a space after the colon. */
+			'invalid_address'      => __( 'Invalid address: ' ),
+			'invalid_header'       => __( 'Invalid header name or value' ),
+			/* translators: There is a space after the colon. */
+			'invalid_hostentry'    => __( 'Invalid hostentry: ' ),
+			/* translators: There is a space after the colon. */
+			'invalid_host'         => __( 'Invalid host: ' ),
+			/* translators: There is a space at the beginning. */
+			'mailer_not_supported' => __( ' mailer is not supported.' ),
+			'provide_address'      => __( 'You must provide at least one recipient email address.' ),
+			/* translators: There is a space after the colon. */
+			'recipients_failed'    => __( 'SMTP Error: The following recipients failed: ' ),
+			/* translators: There is a space after the colon. */
+			'signing'              => __( 'Signing Error: ' ),
+			/* translators: There is a space after the colon. */
+			'smtp_code'            => __( 'SMTP code: ' ),
+			/* translators: There is a space after the colon. */
+			'smtp_code_ex'         => __( 'Additional SMTP info: ' ),
+			'smtp_connect_failed'  => __( 'SMTP connect() failed.' ),
+			/* translators: There is a space after the colon. */
+			'smtp_detail'          => __( 'Detail: ' ),
+			/* translators: There is a space after the colon. */
+			'smtp_error'           => __( 'SMTP server error: ' ),
+			/* translators: There is a space after the colon. */
+			'variable_set'         => __( 'Cannot set or reset variable: ' ),
+		);
+		$this->language = $error_strings;
+		return true;
+	}
+}
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index e96f0f7c37429..11dffac4b3270 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -4579,7 +4579,7 @@ function paginate_links( $args = '' ) {
 	$dots       = false;
 
 	if ( $args['prev_next'] && $current && 1 < $current ) :
-		$link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
+		$link = str_replace( '%_%', 2 === $current ? '' : $args['format'], $args['base'] );
 		$link = str_replace( '%#%', $current - 1, $link );
 		if ( $add_args ) {
 			$link = add_query_arg( $add_args, $link );
@@ -4601,7 +4601,7 @@ function paginate_links( $args = '' ) {
 	endif;
 
 	for ( $n = 1; $n <= $total; $n++ ) :
-		if ( $n == $current ) :
+		if ( $n === $current ) :
 			$page_links[] = sprintf(
 				'<span aria-current="%s" class="page-numbers current">%s</span>',
 				esc_attr( $args['aria_current'] ),
@@ -4611,7 +4611,7 @@ function paginate_links( $args = '' ) {
 			$dots = true;
 		else :
 			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
-				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
+				$link = str_replace( '%_%', 1 === $n ? '' : $args['format'], $args['base'] );
 				$link = str_replace( '%#%', $n, $link );
 				if ( $add_args ) {
 					$link = add_query_arg( $add_args, $link );
diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
index c84f1660f931b..4b26504b76356 100644
--- a/src/wp-includes/option.php
+++ b/src/wp-includes/option.php
@@ -162,37 +162,46 @@ function get_option( $option, $default_value = false ) {
 
 	if ( ! wp_installing() ) {
 		$alloptions = wp_load_alloptions();
-
+		/*
+		 * When getting an option value, we check in the following order for performance:
+		 *
+		 * 1. Check the 'alloptions' cache first to prioritize existing loaded options.
+		 * 2. Check the 'notoptions' cache before a cache lookup or DB hit.
+		 * 3. Check the 'options' cache prior to a DB hit.
+		 * 4. Check the DB for the option and cache it in either the 'options' or 'notoptions' cache.
+		 */
 		if ( isset( $alloptions[ $option ] ) ) {
 			$value = $alloptions[ $option ];
 		} else {
+			// Check for non-existent options first to avoid unnecessary object cache lookups and DB hits.
+			$notoptions = wp_cache_get( 'notoptions', 'options' );
+
+			if ( ! is_array( $notoptions ) ) {
+				$notoptions = array();
+				wp_cache_set( 'notoptions', $notoptions, 'options' );
+			}
+
+			if ( isset( $notoptions[ $option ] ) ) {
+				/**
+				 * Filters the default value for an option.
+				 *
+				 * The dynamic portion of the hook name, `$option`, refers to the option name.
+				 *
+				 * @since 3.4.0
+				 * @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_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_value, $option, $passed_default );
+			}
+
 			$value = wp_cache_get( $option, 'options' );
 
 			if ( false === $value ) {
-				// Prevent non-existent options from triggering multiple queries.
-				$notoptions = wp_cache_get( 'notoptions', 'options' );
-
-				// Prevent non-existent `notoptions` key from triggering multiple key lookups.
-				if ( ! is_array( $notoptions ) ) {
-					$notoptions = array();
-					wp_cache_set( 'notoptions', $notoptions, 'options' );
-				} elseif ( isset( $notoptions[ $option ] ) ) {
-					/**
-					 * Filters the default value for an option.
-					 *
-					 * The dynamic portion of the hook name, `$option`, refers to the option name.
-					 *
-					 * @since 3.4.0
-					 * @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_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_value, $option, $passed_default );
-				}
 
 				$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
 
diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
index 3dd629fa1990c..f4a8d8412e88c 100644
--- a/src/wp-includes/pluggable.php
+++ b/src/wp-includes/pluggable.php
@@ -251,7 +251,8 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 			require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php';
 			require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php';
 			require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
-			$phpmailer = new PHPMailer\PHPMailer\PHPMailer( true );
+			require_once ABSPATH . WPINC . '/class-wp-phpmailer.php';
+			$phpmailer = new WP_PHPMailer( true );
 
 			$phpmailer::$validator = static function ( $email ) {
 				return (bool) is_email( $email );
@@ -2581,18 +2582,38 @@ function wp_salt( $scheme = 'auth' ) {
 
 if ( ! function_exists( 'wp_hash' ) ) :
 	/**
-	 * Gets hash of given string.
+	 * Gets the hash of the given string.
+	 *
+	 * The default algorithm is md5 but can be changed to any algorithm supported by
+	 * `hash_hmac()`. Use the `hash_hmac_algos()` function to check the supported
+	 * algorithms.
 	 *
 	 * @since 2.0.3
+	 * @since 6.8.0 The `$algo` parameter was added.
+	 *
+	 * @throws InvalidArgumentException if the hashing algorithm is not supported.
 	 *
 	 * @param string $data   Plain text to hash.
 	 * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce).
+	 * @param string $algo   Hashing algorithm to use. Default: 'md5'.
 	 * @return string Hash of $data.
 	 */
-	function wp_hash( $data, $scheme = 'auth' ) {
+	function wp_hash( $data, $scheme = 'auth', $algo = 'md5' ) {
 		$salt = wp_salt( $scheme );
 
-		return hash_hmac( 'md5', $data, $salt );
+		// Ensure the algorithm is supported by the hash_hmac function.
+		if ( ! in_array( $algo, hash_hmac_algos(), true ) ) {
+			throw new InvalidArgumentException(
+				sprintf(
+					/* translators: 1: Name of a cryptographic hash algorithm. 2: List of supported algorithms. */
+					__( 'Unsupported hashing algorithm: %1$s. Supported algorithms are: %2$s' ),
+					$algo,
+					implode( ', ', hash_hmac_algos() )
+				)
+			);
+		}
+
+		return hash_hmac( $algo, $data, $salt );
 	}
 endif;
 
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 4d85ef2fb25d7..98b9092f16f1f 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -852,13 +852,15 @@ function get_attached_file( $attachment_id, $unfiltered = false ) {
  * Updates attachment file path based on attachment ID.
  *
  * Used to update the file path of the attachment, which uses post meta name
- * '_wp_attached_file' to store the path of the attachment.
+ * `_wp_attached_file` to store the path of the attachment.
  *
  * @since 2.1.0
  *
  * @param int    $attachment_id Attachment ID.
  * @param string $file          File path for the attachment.
- * @return bool True on success, false on failure.
+ * @return int|bool Meta ID if the `_wp_attached_file` key didn't exist for the attachment.
+ *                  True on successful update, false on failure or if the `$file` value passed
+ *                  to the function is the same as the one that is already in the database.
  */
 function update_attached_file( $attachment_id, $file ) {
 	if ( ! get_post( $attachment_id ) ) {
@@ -6061,9 +6063,9 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 
 	$revparts = array_reverse( $parts );
 
-	$foundid = 0;
+	$found_id = 0;
 	foreach ( (array) $pages as $page ) {
-		if ( $page->post_name == $revparts[0] ) {
+		if ( $page->post_name === $revparts[0] ) {
 			$count = 0;
 			$p     = $page;
 
@@ -6071,18 +6073,21 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 			 * Loop through the given path parts from right to left,
 			 * ensuring each matches the post ancestry.
 			 */
-			while ( 0 != $p->post_parent && isset( $pages[ $p->post_parent ] ) ) {
+			while ( 0 !== (int) $p->post_parent && isset( $pages[ $p->post_parent ] ) ) {
 				++$count;
 				$parent = $pages[ $p->post_parent ];
-				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] ) {
+				if ( ! isset( $revparts[ $count ] ) || $parent->post_name !== $revparts[ $count ] ) {
 					break;
 				}
 				$p = $parent;
 			}
 
-			if ( 0 == $p->post_parent && count( $revparts ) === $count + 1 && $p->post_name == $revparts[ $count ] ) {
-				$foundid = $page->ID;
-				if ( $page->post_type == $post_type ) {
+			if ( 0 === (int) $p->post_parent
+				&& count( $revparts ) === $count + 1
+				&& $p->post_name === $revparts[ $count ]
+			) {
+				$found_id = $page->ID;
+				if ( $page->post_type === $post_type ) {
 					break;
 				}
 			}
@@ -6090,10 +6095,10 @@ 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, 'post-queries' );
+	wp_cache_set( $cache_key, $found_id, 'post-queries' );
 
-	if ( $foundid ) {
-		return get_post( $foundid, $output );
+	if ( $found_id ) {
+		return get_post( $found_id, $output );
 	}
 
 	return null;
@@ -7207,12 +7212,14 @@ function wp_mime_type_icon( $mime = 0, $preferred_ext = '.png' ) {
  */
 function wp_check_for_changed_slugs( $post_id, $post, $post_before ) {
 	// Don't bother if it hasn't changed.
-	if ( $post->post_name == $post_before->post_name ) {
+	if ( $post->post_name === $post_before->post_name ) {
 		return;
 	}
 
 	// We're only concerned with published, non-hierarchical objects.
-	if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) {
+	if ( ! ( 'publish' === $post->post_status || ( 'attachment' === $post->post_type && 'inherit' === $post->post_status ) )
+		|| is_post_type_hierarchical( $post->post_type )
+	) {
 		return;
 	}
 
@@ -7253,12 +7260,14 @@ function wp_check_for_changed_dates( $post_id, $post, $post_before ) {
 	$new_date      = gmdate( 'Y-m-d', strtotime( $post->post_date ) );
 
 	// Don't bother if it hasn't changed.
-	if ( $new_date == $previous_date ) {
+	if ( $new_date === $previous_date ) {
 		return;
 	}
 
 	// We're only concerned with published, non-hierarchical objects.
-	if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) {
+	if ( ! ( 'publish' === $post->post_status || ( 'attachment' === $post->post_type && 'inherit' === $post->post_status ) )
+		|| is_post_type_hierarchical( $post->post_type )
+	) {
 		return;
 	}
 
@@ -7354,7 +7363,7 @@ function get_posts_by_author_sql( $post_type, $full = true, $post_author = null,
 				$id = get_current_user_id();
 				if ( null === $post_author || ! $full ) {
 					$post_status_sql .= " OR post_status = 'private' AND post_author = $id";
-				} elseif ( $id == (int) $post_author ) {
+				} elseif ( $id === (int) $post_author ) {
 					$post_status_sql .= " OR post_status = 'private'";
 				} // Else none.
 			} // Else none.
@@ -7930,7 +7939,7 @@ function wp_check_post_hierarchy_for_loops( $post_parent, $post_id ) {
 	}
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_id ) {
+	if ( $post_parent === $post_id ) {
 		return 0;
 	}
 
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
index 54285fa560bee..4108f9711c8a7 100644
--- 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
@@ -189,7 +189,7 @@ public function get_items( $request ) {
 			$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'];
+			$page            = isset( $query_args['paged'] ) ? (int) $query_args['paged'] : 0;
 			$total_revisions = $revisions_query->found_posts;
 
 			if ( $total_revisions < 1 ) {
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 95851199c6e4d..6f872be3dfd78 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
@@ -457,7 +457,7 @@ static function ( $format ) {
 			remove_filter( 'post_password_required', array( $this, 'check_password_required' ) );
 		}
 
-		$page        = (int) $query_args['paged'];
+		$page        = isset( $query_args['paged'] ) ? (int) $query_args['paged'] : 0;
 		$total_posts = $posts_query->found_posts;
 
 		if ( $total_posts < 1 && $page > 1 ) {
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 fb5fa29231a4f..1dbc611631b9b 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
@@ -294,7 +294,7 @@ public function get_items( $request ) {
 			$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'];
+			$page            = isset( $query_args['paged'] ) ? (int) $query_args['paged'] : 0;
 			$total_revisions = $revisions_query->found_posts;
 
 			if ( $total_revisions < 1 ) {
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-template-revisions-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-template-revisions-controller.php
index 22cdc268fa8c6..c0bc7663e1f8b 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-template-revisions-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-template-revisions-controller.php
@@ -170,7 +170,17 @@ protected function get_parent( $parent_template_id ) {
 			return new WP_Error(
 				'rest_post_invalid_parent',
 				__( 'Invalid template parent ID.' ),
-				array( 'status' => 404 )
+				array( 'status' => WP_Http::NOT_FOUND )
+			);
+		}
+
+		$parent_post_id = isset( $template->wp_id ) ? (int) $template->wp_id : 0;
+
+		if ( $parent_post_id <= 0 ) {
+			return new WP_Error(
+				'rest_invalid_template',
+				__( 'Templates based on theme files can\'t have revisions.' ),
+				array( 'status' => WP_Http::BAD_REQUEST )
 			);
 		}
 
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 6a5768a8a4b9b..19813615bd80e 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -983,7 +983,7 @@ function wp_default_scripts( $scripts ) {
 		/* translators: %s: File name. */
 		'file_exceeds_size_limit'   => __( '%s exceeds the maximum upload size for this site.' ),
 		'zero_byte_file'            => __( 'This file is empty. Please try another.' ),
-		'invalid_filetype'          => __( 'Sorry, you are not allowed to upload this file type.' ),
+		'invalid_filetype'          => __( 'This file cannot be processed by the web server.' ),
 		'not_an_image'              => __( 'This file is not an image. Please try another.' ),
 		'image_memory_exceeded'     => __( 'Memory exceeded. Please try another smaller file.' ),
 		'image_dimensions_exceeded' => __( 'This is larger than the maximum size. Please try another.' ),
@@ -1007,7 +1007,7 @@ function wp_default_scripts( $scripts ) {
 		/* translators: %s: File name. */
 		'error_uploading'           => __( '&#8220;%s&#8221; has failed to upload.' ),
 		'unsupported_image'         => __( 'This image cannot be displayed in a web browser. For best results convert it to JPEG before uploading.' ),
-		'noneditable_image'         => __( 'This image cannot be processed by the web server. Convert it to JPEG or PNG before uploading.' ),
+		'noneditable_image'         => __( 'The web server cannot generate responsive image sizes for this image. Convert it to JPEG or PNG before uploading.' ),
 		'file_url_copied'           => __( 'The file URL has been copied to your clipboard' ),
 	);
 
diff --git a/src/wp-includes/theme-i18n.json b/src/wp-includes/theme-i18n.json
index 1781b9356f4bf..1b7a8d0d31190 100644
--- a/src/wp-includes/theme-i18n.json
+++ b/src/wp-includes/theme-i18n.json
@@ -3,33 +3,33 @@
 	"description": "Style variation description",
 	"settings": {
 		"typography": {
-				"fontSizes": [
-					{
-						"name": "Font size name"
-					}
-				],
-				"fontFamilies": [
-					{
-						"name": "Font family name"
-					}
-				]
+			"fontSizes": [
+				{
+					"name": "Font size name"
+				}
+			],
+			"fontFamilies": [
+				{
+					"name": "Font family name"
+				}
+			]
 		},
 		"color": {
-				"palette": [
-					{
-						"name": "Color name"
-					}
-				],
-				"gradients": [
-					{
-						"name": "Gradient name"
-					}
-				],
-				"duotone": [
-					{
-						"name": "Duotone name"
-					}
-				]
+			"palette": [
+				{
+					"name": "Color name"
+				}
+			],
+			"gradients": [
+				{
+					"name": "Gradient name"
+				}
+			],
+			"duotone": [
+				{
+					"name": "Duotone name"
+				}
+			]
 		},
 		"spacing": {
 			"spacingSizes": [
@@ -45,6 +45,13 @@
 				}
 			]
 		},
+		"shadow": {
+			"presets": [
+				{
+					"name": "Shadow name"
+				}
+			]
+		},
 		"blocks": {
 			"*": {
 				"typography": {
@@ -69,6 +76,18 @@
 						{
 							"name": "Gradient name"
 						}
+					],
+					"duotone": [
+						{
+							"name": "Duotone name"
+						}
+					]
+				},
+				"dimensions": {
+					"aspectRatios": [
+						{
+							"name": "Aspect ratio name"
+						}
 					]
 				},
 				"spacing": {
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index f60dbe5d3fae2..6222e932a9015 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -48,10 +48,10 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
 			'remember'      => false,
 		);
 
-		if ( ! empty( $_POST['log'] ) ) {
+		if ( ! empty( $_POST['log'] ) && is_string( $_POST['log'] ) ) {
 			$credentials['user_login'] = wp_unslash( $_POST['log'] );
 		}
-		if ( ! empty( $_POST['pwd'] ) ) {
+		if ( ! empty( $_POST['pwd'] ) && is_string( $_POST['pwd'] ) ) {
 			$credentials['user_password'] = $_POST['pwd'];
 		}
 		if ( ! empty( $_POST['rememberme'] ) ) {
diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php
index 32d8a95e1b984..aa17656507a4f 100644
--- a/src/wp-includes/widgets.php
+++ b/src/wp-includes/widgets.php
@@ -1746,7 +1746,7 @@ function wp_widget_rss_form( $args, $inputs = null ) {
 		<input id="rss-show-author-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_author]" type="checkbox" value="1" <?php checked( $args['show_author'] ); ?> />
 		<label for="rss-show-author-<?php echo $esc_number; ?>"><?php _e( 'Display item author if available?' ); ?></label><br />
 	<?php endif; if ( $inputs['show_date'] ) : ?>
-		<input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/>
+		<input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?> />
 		<label for="rss-show-date-<?php echo $esc_number; ?>"><?php _e( 'Display item date?' ); ?></label><br />
 	<?php endif; ?>
 	</p>
diff --git a/tests/performance/compare-results.js b/tests/performance/compare-results.js
index c9d51e1a11117..c47de270f0727 100644
--- a/tests/performance/compare-results.js
+++ b/tests/performance/compare-results.js
@@ -96,6 +96,8 @@ if ( process.env.GITHUB_SHA ) {
 	);
 }
 
+summaryMarkdown += `<details><summary>Results</summary>`;
+
 for ( const { title, results } of afterStats ) {
 	const prevStat = beforeStats.find( ( s ) => s.title === title );
 
@@ -143,10 +145,12 @@ for ( const { title, results } of afterStats ) {
 		console.log( '(no results)' );
 	}
 
-	summaryMarkdown += `**${ title }**\n\n`;
+	summaryMarkdown += `<b>${ title }</b>\n\n`;
 	summaryMarkdown += `${ formatAsMarkdownTable( rows ) }\n`;
 }
 
+summaryMarkdown += `</details>`;
+
 writeFileSync(
 	join( process.env.WP_ARTIFACTS_PATH, '/performance-results.md' ),
 	summaryMarkdown
diff --git a/tests/performance/log-results.js b/tests/performance/log-results.js
index 581c0d39868b5..f8214b68d4eb3 100644
--- a/tests/performance/log-results.js
+++ b/tests/performance/log-results.js
@@ -11,19 +11,25 @@
  * External dependencies.
  */
 const https = require( 'https' );
-const [ token, branch, hash, baseHash, timestamp, host ] =
+const [ token, branch, hash, baseHash, date, host ] =
 	process.argv.slice( 2 );
 const { median, parseFile, accumulateValues } = require( './utils' );
 
 const testSuiteMap = {
 	'Admin › Locale: en_US': 'admin',
 	'Admin › Locale: de_DE': 'admin-l10n',
-	'Front End › Theme: twentytwentyone, Locale: en_US': 'home-classic-theme',
-	'Front End › Theme: twentytwentyone, Locale: de_DE':
+	'Homepage › Theme: twentytwentyone, Locale: en_US': 'home-classic-theme',
+	'Homepage › Theme: twentytwentyone, Locale: de_DE':
 		'home-classic-theme-l10n',
-	'Front End › Theme: twentytwentythree, Locale: en_US': 'home-block-theme',
-	'Front End › Theme: twentytwentythree, Locale: de_DE':
+	'Homepage › Theme: twentytwentythree, Locale: en_US': 'home-block-theme',
+	'Homepage › Theme: twentytwentythree, Locale: de_DE':
 		'home-block-theme-l10n',
+	'Homepage › Theme: twentytwentyfour, Locale: en_US': 'home-twentytwentyfour',
+	'Homepage › Theme: twentytwentyfour, Locale: de_DE':
+		'home-twentytwentyfour-l10n',
+	'Homepage › Theme: twentytwentyfive, Locale: en_US': 'home-twentytwentyfive',
+	'Homepage › Theme: twentytwentyfive, Locale: de_DE':
+		'home-twentytwentyfive-l10n',
 };
 
 /**
@@ -81,7 +87,7 @@ const data = new TextEncoder().encode(
 		branch,
 		hash,
 		baseHash,
-		timestamp: parseInt( timestamp, 10 ),
+		timestamp: date,
 		metrics: metrics,
 		baseMetrics: baseMetrics,
 	} )
diff --git a/tests/performance/specs/admin.test.js b/tests/performance/specs/admin.test.js
index 36bdd9c628aa1..3414fdd3dbed9 100644
--- a/tests/performance/specs/admin.test.js
+++ b/tests/performance/specs/admin.test.js
@@ -6,14 +6,12 @@ import { test } from '@wordpress/e2e-test-utils-playwright';
 /**
  * Internal dependencies
  */
-import { camelCaseDashes } from '../utils';
+import { camelCaseDashes, locales } from '../utils';
 
 const results = {
 	timeToFirstByte: [],
 };
 
-const locales = [ 'en_US', 'de_DE' ];
-
 test.describe( 'Admin', () => {
 	for ( const locale of locales ) {
 		test.describe( `Locale: ${ locale }`, () => {
@@ -47,9 +45,14 @@ test.describe( 'Admin', () => {
 			const iterations = Number( process.env.TEST_RUNS );
 			for ( let i = 1; i <= iterations; i++ ) {
 				test( `Measure load time metrics (${ i } of ${ iterations })`, async ( {
+					page,
 					admin,
 					metrics,
 				} ) => {
+					// Clear caches using the clear-cache.php mu-plugin. Not actually loading the page.
+					await page.goto( '/?clear_cache' );
+
+					// This is the actual page to test.
 					await admin.visitAdminPage( '/' );
 
 					const serverTiming = await metrics.getServerTiming();
diff --git a/tests/performance/specs/home.test.js b/tests/performance/specs/home.test.js
index 004c8f03debd4..cd3de40518fe3 100644
--- a/tests/performance/specs/home.test.js
+++ b/tests/performance/specs/home.test.js
@@ -6,7 +6,7 @@ import { test } from '@wordpress/e2e-test-utils-playwright';
 /**
  * Internal dependencies
  */
-import { camelCaseDashes } from '../utils';
+import { camelCaseDashes, themes, locales } from '../utils';
 
 const results = {
 	timeToFirstByte: [],
@@ -14,11 +14,7 @@ const results = {
 	lcpMinusTtfb: [],
 };
 
-const themes = [ 'twentytwentyone', 'twentytwentythree', 'twentytwentyfour', 'twentytwentyfive' ];
-
-const locales = [ 'en_US', 'de_DE' ];
-
-test.describe( 'Front End', () => {
+test.describe( 'Homepage', () => {
 	test.use( {
 		storageState: {}, // User will be logged out.
 	} );
@@ -54,6 +50,10 @@ test.describe( 'Front End', () => {
 						page,
 						metrics,
 					} ) => {
+						// Clear caches using the clear-cache.php mu-plugin. Not actually loading the page.
+						await page.goto( '/?clear_cache' );
+
+						// This is the actual page to test.
 						await page.goto( '/' );
 
 						const serverTiming = await metrics.getServerTiming();
diff --git a/tests/performance/specs/single-post.test.js b/tests/performance/specs/single-post.test.js
new file mode 100644
index 0000000000000..dbdf6916ef2fd
--- /dev/null
+++ b/tests/performance/specs/single-post.test.js
@@ -0,0 +1,79 @@
+/**
+ * WordPress dependencies
+ */
+import { test } from '@wordpress/e2e-test-utils-playwright';
+
+/**
+ * Internal dependencies
+ */
+import { camelCaseDashes, themes, locales } from '../utils';
+
+const results = {
+	timeToFirstByte: [],
+	largestContentfulPaint: [],
+	lcpMinusTtfb: [],
+};
+
+test.describe( 'Single Post', () => {
+	test.use( {
+		storageState: {}, // User will be logged out.
+	} );
+
+	for ( const theme of themes ) {
+		for ( const locale of locales ) {
+			test.describe( `Theme: ${ theme }, Locale: ${ locale }`, () => {
+				test.beforeAll( async ( { requestUtils } ) => {
+					await requestUtils.activateTheme( theme );
+					await requestUtils.updateSiteSettings( {
+						language: 'en_US' === locale ? '' : locale,
+					} );
+				} );
+
+				test.afterAll( async ( { requestUtils }, testInfo ) => {
+					await testInfo.attach( 'results', {
+						body: JSON.stringify( results, null, 2 ),
+						contentType: 'application/json',
+					} );
+
+					await requestUtils.updateSiteSettings( {
+						language: '',
+					} );
+
+					results.largestContentfulPaint = [];
+					results.timeToFirstByte = [];
+					results.lcpMinusTtfb = [];
+				} );
+
+				const iterations = Number( process.env.TEST_RUNS );
+				for ( let i = 1; i <= iterations; i++ ) {
+					test( `Measure load time metrics (${ i } of ${ iterations })`, async ( {
+						page,
+						metrics,
+					} ) => {
+						// Clear caches using the clear-cache.php mu-plugin. Not actually loading the page.
+						await page.goto( '/?clear_cache' );
+
+						// This is the actual page to test.
+						await page.goto( '/2018/11/03/block-image/' );
+
+						const serverTiming = await metrics.getServerTiming();
+
+						for ( const [ key, value ] of Object.entries(
+							serverTiming
+						) ) {
+							results[ camelCaseDashes( key ) ] ??= [];
+							results[ camelCaseDashes( key ) ].push( value );
+						}
+
+						const ttfb = await metrics.getTimeToFirstByte();
+						const lcp = await metrics.getLargestContentfulPaint();
+
+						results.largestContentfulPaint.push( lcp );
+						results.timeToFirstByte.push( ttfb );
+						results.lcpMinusTtfb.push( lcp - ttfb );
+					} );
+				}
+			} );
+		}
+	}
+} );
diff --git a/tests/performance/utils.js b/tests/performance/utils.js
index 4d023be586048..b7481dfd67605 100644
--- a/tests/performance/utils.js
+++ b/tests/performance/utils.js
@@ -6,6 +6,10 @@ const { join } = require( 'node:path' );
 
 process.env.WP_ARTIFACTS_PATH ??= join( process.cwd(), 'artifacts' );
 
+const locales = [ 'en_US', 'de_DE' ];
+
+const themes = [ 'twentytwentyone', 'twentytwentythree', 'twentytwentyfour', 'twentytwentyfive' ];
+
 /**
  * Parse test files into JSON objects.
  *
@@ -189,4 +193,6 @@ module.exports = {
 	standardDeviation,
 	medianAbsoluteDeviation,
 	accumulateValues,
+	themes,
+	locales,
 };
diff --git a/tests/performance/wp-content/mu-plugins/clear-cache.php b/tests/performance/wp-content/mu-plugins/clear-cache.php
new file mode 100644
index 0000000000000..4d6ff4ea2c586
--- /dev/null
+++ b/tests/performance/wp-content/mu-plugins/clear-cache.php
@@ -0,0 +1,27 @@
+<?php
+
+add_action(
+	'plugins_loaded',
+	static function () {
+		if ( isset( $_GET['clear_cache'] ) ) {
+			if ( function_exists( 'opcache_reset' ) ) {
+				opcache_reset();
+			}
+
+			if ( function_exists( 'apcu_clear_cache' ) ) {
+				apcu_clear_cache();
+			}
+
+			wp_cache_flush();
+
+			delete_expired_transients( true );
+
+			clearstatcache( true );
+
+			status_header( 202 );
+
+			die;
+		}
+	},
+	1
+);
diff --git a/tests/phpunit/data/images/png-tests/Palette_icon-or8.png b/tests/phpunit/data/images/png-tests/Palette_icon-or8.png
new file mode 100644
index 0000000000000..ead89766a3246
Binary files /dev/null and b/tests/phpunit/data/images/png-tests/Palette_icon-or8.png differ
diff --git a/tests/phpunit/data/images/png-tests/cloudflare-status.png b/tests/phpunit/data/images/png-tests/cloudflare-status.png
new file mode 100644
index 0000000000000..8517ff0b59fb9
Binary files /dev/null and b/tests/phpunit/data/images/png-tests/cloudflare-status.png differ
diff --git a/tests/phpunit/data/images/png-tests/deskcat8.png b/tests/phpunit/data/images/png-tests/deskcat8.png
new file mode 100644
index 0000000000000..89e62cd9e2b2c
Binary files /dev/null and b/tests/phpunit/data/images/png-tests/deskcat8.png differ
diff --git a/tests/phpunit/data/images/png-tests/rabbit-time-paletted-or8.png b/tests/phpunit/data/images/png-tests/rabbit-time-paletted-or8.png
new file mode 100644
index 0000000000000..cff28ed3b2b3a
Binary files /dev/null and b/tests/phpunit/data/images/png-tests/rabbit-time-paletted-or8.png differ
diff --git a/tests/phpunit/data/images/png-tests/test8.png b/tests/phpunit/data/images/png-tests/test8.png
new file mode 100644
index 0000000000000..49a513647147f
Binary files /dev/null and b/tests/phpunit/data/images/png-tests/test8.png differ
diff --git a/tests/phpunit/data/languages/de_DE.l10n.php b/tests/phpunit/data/languages/de_DE.l10n.php
index 8eef01d79ce00..9190d3641ca68 100644
--- a/tests/phpunit/data/languages/de_DE.l10n.php
+++ b/tests/phpunit/data/languages/de_DE.l10n.php
@@ -1,2 +1,2 @@
 <?php
-return ['domain'=>NULL,'plural-forms'=>'nplurals=2; plural=n != 1;','messages'=>['html_lang_attribute'=>'de-DE','text directionltr'=>'ltr','number_format_decimal_point'=>',','number_format_thousands_sep'=>'.','Update %s now'=>'Jetzt %s aktualisieren','[%1$s] Confirm Action: %2$s'=>'[%1$s] Aktion bestätigen: %2$s','[%s] Erasure Request Fulfilled'=>'[%s] Löschauftrag ausgeführt','[%s] Personal Data Export'=>'[%s] Export personenbezogener Daten'],'language'=>'de_DE','x-generator'=>'Poedit 2.2.1'];
\ No newline at end of file
+return ['domain'=>NULL,'plural-forms'=>'nplurals=2; plural=n != 1;','messages'=>['html_lang_attribute'=>'de-DE','text directionltr'=>'ltr','number_format_decimal_point'=>',','number_format_thousands_sep'=>'.','Update %s now'=>'Jetzt %s aktualisieren','[%1$s] Confirm Action: %2$s'=>'[%1$s] Aktion bestätigen: %2$s','[%s] Erasure Request Fulfilled'=>'[%s] Löschauftrag ausgeführt','[%s] Personal Data Export'=>'[%s] Export personenbezogener Daten', 'You must provide at least one recipient email address.'=>'Du musst mindestens eine Empfänger-E-Mail-Adresse angeben.'],'language'=>'de_DE','x-generator'=>'Poedit 2.2.1'];
diff --git a/tests/phpunit/data/languages/de_DE.mo b/tests/phpunit/data/languages/de_DE.mo
index dcfef58f48922..8254de97f2af3 100644
Binary files a/tests/phpunit/data/languages/de_DE.mo and b/tests/phpunit/data/languages/de_DE.mo differ
diff --git a/tests/phpunit/data/languages/de_DE.po b/tests/phpunit/data/languages/de_DE.po
index aa97af62e9a0f..b68c53867d8bc 100644
--- a/tests/phpunit/data/languages/de_DE.po
+++ b/tests/phpunit/data/languages/de_DE.po
@@ -57,3 +57,7 @@ msgstr "[%s] Löschauftrag ausgeführt"
 #: wp-admin/includes/file.php:2415
 msgid "[%s] Personal Data Export"
 msgstr "[%s] Export personenbezogener Daten"
+
+#: wp-includes/class-wp-phpmailer.php:71
+msgid "You must provide at least one recipient email address."
+msgstr "Du musst mindestens eine Empfänger-E-Mail-Adresse angeben."
diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 5ee8f38b5753f..c28ddb6eb07b2 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -246,10 +246,6 @@
 $multisite = $multisite || ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISITE );
 $multisite = $multisite || ( defined( 'MULTISITE' ) && MULTISITE );
 
-// Override the PHPMailer.
-require_once __DIR__ . '/mock-mailer.php';
-$phpmailer = new MockPHPMailer( true );
-
 if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
 	define( 'WP_DEFAULT_THEME', 'default' );
 }
@@ -305,6 +301,11 @@ function wp_tests_options( $value ) {
 // Load WordPress.
 require_once ABSPATH . 'wp-settings.php';
 
+// Override the PHPMailer.
+require_once __DIR__ . '/mock-mailer.php';
+
+$phpmailer = new MockPHPMailer( true );
+
 // Delete any default posts & related data.
 _delete_all_posts();
 
diff --git a/tests/phpunit/includes/mock-mailer.php b/tests/phpunit/includes/mock-mailer.php
index f5172d62a6c59..aedeba4e40cd0 100644
--- a/tests/phpunit/includes/mock-mailer.php
+++ b/tests/phpunit/includes/mock-mailer.php
@@ -1,8 +1,22 @@
 <?php
+/**
+ * Mock PHPMailer class for testing.
+ *
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 4.5.0
+ */
+
 require_once ABSPATH . 'wp-includes/PHPMailer/PHPMailer.php';
 require_once ABSPATH . 'wp-includes/PHPMailer/Exception.php';
+require_once ABSPATH . 'wp-includes/class-wp-phpmailer.php';
 
-class MockPHPMailer extends PHPMailer\PHPMailer\PHPMailer {
+/**
+ * Test class extending WP_PHPMailer.
+ *
+ * @since 4.5.0
+ */
+class MockPHPMailer extends WP_PHPMailer {
 	public $mock_sent = array();
 
 	public function preSend() {
diff --git a/tests/phpunit/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php
index 4bfe80db6fc5d..943cabb7c09c1 100644
--- a/tests/phpunit/tests/admin/includesFile.php
+++ b/tests/phpunit/tests/admin/includesFile.php
@@ -43,6 +43,7 @@ public function test_download_url_non_200_response_code() {
 		add_filter( 'pre_http_request', array( $this, '_fake_download_url_non_200_response_code' ), 10, 3 );
 
 		$error = download_url( 'test_download_url_non_200' );
+
 		$this->assertWPError( $error );
 		$this->assertSame(
 			array(
@@ -55,6 +56,10 @@ public function test_download_url_non_200_response_code() {
 		add_filter( 'download_url_error_max_body_size', array( $this, '__return_5' ) );
 
 		$error = download_url( 'test_download_url_non_200' );
+
+		remove_filter( 'download_url_error_max_body_size', array( $this, '__return_5' ) );
+		remove_filter( 'pre_http_request', array( $this, '_fake_download_url_non_200_response_code' ) );
+
 		$this->assertWPError( $error );
 		$this->assertSame(
 			array(
@@ -63,9 +68,6 @@ public function test_download_url_non_200_response_code() {
 			),
 			$error->get_error_data()
 		);
-
-		remove_filter( 'download_url_error_max_body_size', array( $this, '__return_5' ) );
-		remove_filter( 'pre_http_request', array( $this, '_fake_download_url_non_200_response_code' ) );
 	}
 
 	public function _fake_download_url_non_200_response_code( $response, $parsed_args, $url ) {
@@ -94,11 +96,13 @@ public function test_download_url_should_respect_filename_from_content_dispositi
 		add_filter( 'pre_http_request', array( $this, $filter ), 10, 3 );
 
 		$filename = download_url( 'url_with_content_disposition_header' );
-		$this->assertStringContainsString( 'filename-from-content-disposition-header', $filename );
+
+		remove_filter( 'pre_http_request', array( $this, $filter ) );
+
 		$this->assertFileExists( $filename );
 		$this->unlink( $filename );
 
-		remove_filter( 'pre_http_request', array( $this, $filter ) );
+		$this->assertStringContainsString( 'filename-from-content-disposition-header', $filename );
 	}
 
 	/**
@@ -126,10 +130,12 @@ public function test_save_to_temp_directory_when_getting_filename_from_content_d
 		add_filter( 'pre_http_request', array( $this, $filter ), 10, 3 );
 
 		$filename = download_url( 'url_with_content_disposition_header' );
-		$this->assertStringContainsString( get_temp_dir(), $filename );
-		$this->unlink( $filename );
 
 		remove_filter( 'pre_http_request', array( $this, $filter ) );
+
+		$this->unlink( $filename );
+
+		$this->assertStringContainsString( get_temp_dir(), $filename );
 	}
 
 	/**
@@ -209,10 +215,12 @@ public function test_download_url_should_reject_filename_from_invalid_content_di
 		add_filter( 'pre_http_request', array( $this, $filter ), 10, 3 );
 
 		$filename = download_url( 'url_with_content_disposition_header' );
-		$this->assertStringContainsString( 'url_with_content_disposition_header', $filename );
-		$this->unlink( $filename );
 
 		remove_filter( 'pre_http_request', array( $this, $filter ) );
+
+		$this->unlink( $filename );
+
+		$this->assertStringContainsString( 'url_with_content_disposition_header', $filename );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/auth.php b/tests/phpunit/tests/auth.php
index 5c196b499fcce..f45071904e9c8 100644
--- a/tests/phpunit/tests/auth.php
+++ b/tests/phpunit/tests/auth.php
@@ -634,6 +634,28 @@ public function test_wp_signon_does_not_throw_deprecation_notices_with_default_p
 		$this->assertContains( 'empty_password', $error_codes, 'The "empty_password" error code should be present.' );
 	}
 
+	/**
+	 * Tests that a warning or a fatal error is not thrown when the login or password
+	 * passed via `$_POST` is an array instead of a string.
+	 *
+	 * The messages that we should not see:
+	 * `Warning: wp_strip_all_tags() expects parameter #1 ($text) to be a string, array given`.
+	 * `TypeError: trim(): Argument #1 ($string) must be of type string, array given`.
+	 *
+	 * @ticket 62794
+	 */
+	public function test_wp_signon_does_not_throw_fatal_errors_with_array_parameters() {
+		$_POST['log'] = array( 'example' );
+		$_POST['pwd'] = array( 'example' );
+
+		$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/db.php b/tests/phpunit/tests/db.php
index 3e06afcc1bf2c..57f5db65a2f5a 100644
--- a/tests/phpunit/tests/db.php
+++ b/tests/phpunit/tests/db.php
@@ -296,7 +296,7 @@ public function test_set_sql_mode() {
 		$check_new_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
 		$this->assertSameSets( $new_modes, explode( ',', $check_new_modes ) );
 
-		$wpdb->set_sql_mode( explode( ',', $current_modes ) );
+		$wpdb->set_sql_mode( empty( $current_modes ) ? array() : explode( ',', $current_modes ) );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/functions/wpHash.php b/tests/phpunit/tests/functions/wpHash.php
new file mode 100644
index 0000000000000..63744b188dace
--- /dev/null
+++ b/tests/phpunit/tests/functions/wpHash.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Tests for the behavior of `wp_hash()`
+ *
+ * @group functions
+ *
+ * @covers ::wp_hash
+ */
+class Tests_Functions_wpHash extends WP_UnitTestCase {
+
+	/**
+	 * @dataProvider data_wp_hash_uses_specified_algorithm
+	 *
+	 * @ticket 62005
+	 */
+	public function test_wp_hash_uses_specified_algorithm( string $algo, int $expected_length ) {
+		$hash = wp_hash( 'data', 'auth', $algo );
+
+		$this->assertSame( $expected_length, strlen( $hash ) );
+	}
+
+	public function data_wp_hash_uses_specified_algorithm() {
+		return array(
+			array( 'md5', 32 ),
+			array( 'sha1', 40 ),
+			array( 'sha256', 64 ),
+		);
+	}
+
+	/**
+	 * @ticket 62005
+	 */
+	public function test_wp_hash_throws_exception_on_invalid_algorithm() {
+		$this->expectException( 'InvalidArgumentException' );
+
+		wp_hash( 'data', 'auth', 'invalid' );
+	}
+}
diff --git a/tests/phpunit/tests/image/editorImagick.php b/tests/phpunit/tests/image/editorImagick.php
index 30747f69f1b62..eb71d9ff4715b 100644
--- a/tests/phpunit/tests/image/editorImagick.php
+++ b/tests/phpunit/tests/image/editorImagick.php
@@ -691,4 +691,124 @@ static function ( $value ) {
 		$imagick->destroy();
 		$this->assertSame( $expected, $output, 'The image color of the generated thumb does not match expected opaque background.' ); // Allow for floating point equivalence.
 	}
+
+	/**
+	 * Test filter `image_max_bit_depth` correctly sets the maximum bit depth of resized images.
+	 *
+	 * @ticket 62285
+	 */
+	public function test_image_max_bit_depth() {
+		$file                 = DIR_TESTDATA . '/images/colors_hdr_p3.avif';
+		$imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+
+		// Skip if AVIF not supported.
+		if ( ! $imagick_image_editor->supports_mime_type( 'image/avif' ) ) {
+			$this->markTestSkipped( 'The image editor does not support the AVIF mime type.' );
+		}
+
+		// Skip if depth methods not available.
+		if ( ! method_exists( 'Imagick', 'getImageDepth' ) || ! method_exists( 'Imagick', 'setImageDepth' ) ) {
+			$this->markTestSkipped( 'The image editor does not support get or setImageDepth.' );
+		}
+
+		// Verify source image has 10-bit depth.
+		$imagick = new Imagick( $file );
+		$this->assertSame( 10, $imagick->getImageDepth() );
+
+		// Test ability to save 10-bit image.
+		$imagick->setImageDepth( 10 );
+		$test_file = tempnam( get_temp_dir(), '' ) . 'test10.avif';
+		$imagick->writeImage( $test_file );
+		$im = new Imagick( $test_file );
+
+		if ( $im->getImageDepth() !== 10 ) {
+			$this->markTestSkipped( 'Imagick is unable to save a 10 bit image.' );
+		}
+		$im->destroy();
+		unlink( $test_file );
+
+		// Test default behavior preserves 10-bit depth.
+		$imagick_image_editor->load();
+		$imagick_image_editor->resize( 100, 50 );
+		$test_file = tempnam( get_temp_dir(), '' ) . 'test1.avif';
+		$imagick_image_editor->save( $test_file );
+		$im = new Imagick( $test_file );
+		$this->assertSame( 10, $im->getImageDepth() );
+		unlink( $test_file );
+		$im->destroy();
+
+		// Test filter can set 8-bit depth
+		add_filter( 'image_max_bit_depth', array( $this, '__return_eight' ) );
+		$imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+		$imagick_image_editor->load();
+		$imagick_image_editor->resize( 100, 50 );
+		$test_file = tempnam( get_temp_dir(), '' ) . 'test2.avif';
+		$imagick_image_editor->save( $test_file );
+		$im = new Imagick( $test_file );
+		$this->assertSame( 8, $im->getImageDepth() );
+		unlink( $test_file );
+		$im->destroy();
+	}
+
+	/**
+	 * Helper function to return 8 for the `image_max_bit_depth` filter.
+	 *
+	 * @return int
+	 */
+	public function __return_eight() {
+		return 8;
+	}
+
+	/**
+	 * Test that resizes are smaller for 16 bit PNG images.
+	 *
+	 * @ticket 36477
+	 *
+	 * @dataProvider data_resizes_are_small_for_16bit_images
+	 */
+	public function test_resizes_are_small_for_16bit_images( $file ) {
+
+		$temp_file = DIR_TESTDATA . '/images/test-temp.png';
+
+		$imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+		$imagick_image_editor->load();
+		$size = $imagick_image_editor->get_size();
+
+		$org_filesize = filesize( $file );
+
+		$imagick_image_editor->resize( $size['width'] * .5, $size['height'] * .5 );
+
+		$saved = $imagick_image_editor->save( $temp_file );
+
+		$new_filesize = filesize( $temp_file );
+
+		unlink( $temp_file );
+
+		$this->assertLessThan( $org_filesize, $new_filesize, 'The resized image file size is not smaller than the original file size.' );
+	}
+
+	/**
+	 * data_test_resizes_are_small_for_16bit
+	 *
+	 * @return array[]
+	 */
+	public static function data_resizes_are_small_for_16bit_images() {
+		return array(
+			'cloudflare-status'       => array(
+				DIR_TESTDATA . '/images/png-tests/cloudflare-status.png',
+			),
+			'deskcat8'                => array(
+				DIR_TESTDATA . '/images/png-tests/deskcat8.png',
+			),
+			'17-c3-duplicate-entries' => array(
+				DIR_TESTDATA . '/images/png-tests/Palette_icon-or8.png',
+			),
+			'rabbit-time-paletted'    => array(
+				DIR_TESTDATA . '/images/png-tests/rabbit-time-paletted-or8.png',
+			),
+			'test8'                   => array(
+				DIR_TESTDATA . '/images/png-tests/test8.png',
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/l10n/phpmailerTranslations.php b/tests/phpunit/tests/l10n/phpmailerTranslations.php
new file mode 100644
index 0000000000000..15e8dcd9dac04
--- /dev/null
+++ b/tests/phpunit/tests/l10n/phpmailerTranslations.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Unit tests covering PHPMailer translations.
+ *
+ * @package WordPress
+ * @subpackage PHPMailer
+ * @since 6.8.0
+ */
+
+/**
+ * Class Test_PHPMailer_Translations.
+ *
+ * Provides tests for PHPMailer translations.
+ *
+ * @group mail
+ * @group i18n
+ * @group l10n
+ *
+ * @since 6.8.0
+ */
+class Test_PHPMailer_Translations extends WP_UnitTestCase {
+	/**
+	 * Tests that PHPMailer error message translation works as expected.
+	 *
+	 * @ticket 23311
+	 */
+	public function test_missing_recipient_error_message_should_be_translated() {
+		reset_phpmailer_instance();
+
+		$is_switched = switch_to_locale( 'de_DE' );
+
+		$phpmailer = tests_retrieve_phpmailer_instance();
+		$phpmailer->setFrom( 'invalid-email@example.com' );
+
+		try {
+			$phpmailer->send();
+			$this->fail( 'Expected exception was not thrown' );
+		} catch ( PHPMailer\PHPMailer\Exception $e ) {
+			$error_message = $e->getMessage();
+		} finally {
+			if ( $is_switched ) {
+				restore_previous_locale();
+			}
+		}
+
+		$this->assertSame(
+			'Du musst mindestens eine Empfänger-E-Mail-Adresse angeben.',
+			$error_message,
+			'Error message is not translated as expected'
+		);
+	}
+
+	/**
+	 * Test that PHPMailer error message keys are consistent across implementations.
+	 *
+	 * @ticket 23311
+	 */
+	public function test_all_error_message_keys_should_be_translated() {
+		reset_phpmailer_instance();
+
+		$phpmailer    = new PHPMailer\PHPMailer\PHPMailer();
+		$wp_phpmailer = tests_retrieve_phpmailer_instance();
+
+		$this->assertEqualSets( array_keys( $phpmailer->GetTranslations() ), array_keys( $wp_phpmailer->GetTranslations() ) );
+	}
+}
diff --git a/tests/phpunit/tests/option/option.php b/tests/phpunit/tests/option/option.php
index 36a40d9a2f495..9a2f061aa369c 100644
--- a/tests/phpunit/tests/option/option.php
+++ b/tests/phpunit/tests/option/option.php
@@ -112,8 +112,8 @@ public function test_get_option_notoptions_cache() {
 		wp_cache_set( 'notoptions', $notoptions, 'options' );
 
 		$before = get_num_queries();
-		$value  = get_option( 'invalid' );
-		$after  = get_num_queries();
+		get_option( 'invalid' );
+		$after = get_num_queries();
 
 		$this->assertSame( 0, $after - $before );
 	}
@@ -127,8 +127,8 @@ public function test_get_option_notoptions_set_cache() {
 		get_option( 'invalid' );
 
 		$before = get_num_queries();
-		$value  = get_option( 'invalid' );
-		$after  = get_num_queries();
+		get_option( 'invalid' );
+		$after = get_num_queries();
 
 		$notoptions = wp_cache_get( 'notoptions', 'options' );
 
@@ -137,25 +137,6 @@ public function test_get_option_notoptions_set_cache() {
 		$this->assertArrayHasKey( 'invalid', $notoptions, 'The "invalid" option should be in the notoptions cache.' );
 	}
 
-	/**
-	 * @ticket 58277
-	 *
-	 * @covers ::get_option
-	 */
-	public function test_get_option_notoptions_do_not_load_cache() {
-		add_option( 'foo', 'bar', '', false );
-		wp_cache_delete( 'notoptions', 'options' );
-
-		$before = get_num_queries();
-		$value  = get_option( 'foo' );
-		$after  = get_num_queries();
-
-		$notoptions = wp_cache_get( 'notoptions', 'options' );
-
-		$this->assertSame( 0, $after - $before, 'The options cache was not hit on the second call to `get_option()`.' );
-		$this->assertFalse( $notoptions, 'The notoptions cache should not be set.' );
-	}
-
 	/**
 	 * @covers ::get_option
 	 * @covers ::add_option
@@ -548,4 +529,88 @@ public function test_add_option_clears_the_notoptions_cache() {
 		$updated_notoptions = wp_cache_get( 'notoptions', 'options' );
 		$this->assertArrayNotHasKey( $option_name, $updated_notoptions, 'The "foobar" option should not be in the notoptions cache after adding it.' );
 	}
+
+	/**
+	 * Test that get_option() does not hit the external cache multiple times for the same option.
+	 *
+	 * @ticket 62692
+	 *
+	 * @covers ::get_option
+	 *
+	 * @dataProvider data_get_option_does_not_hit_the_external_cache_multiple_times_for_the_same_option
+	 *
+	 * @param int    $expected_connections Expected number of connections to the memcached server.
+	 * @param bool   $option_exists        Whether the option should be set. Default true.
+	 * @param string $autoload             Whether the option should be auto loaded. Default true.
+	 */
+	public function test_get_option_does_not_hit_the_external_cache_multiple_times_for_the_same_option( $expected_connections, $option_exists = true, $autoload = true ) {
+		if ( ! wp_using_ext_object_cache() ) {
+			$this->markTestSkipped( 'This test requires an external object cache.' );
+		}
+
+		if ( false === $this->helper_object_cache_stats_cmd_get() ) {
+			$this->markTestSkipped( 'This test requires access to the number of get requests to the external object cache.' );
+		}
+
+		if ( $option_exists ) {
+			add_option( 'ticket-62692', 'value', '', $autoload );
+		}
+
+		wp_cache_delete_multiple( array( 'ticket-62692', 'notoptions', 'alloptions' ), 'options' );
+
+		$connections_start = $this->helper_object_cache_stats_cmd_get();
+
+		$call_getter = 10;
+		while ( $call_getter-- ) {
+			get_option( 'ticket-62692' );
+		}
+
+		$connections_end = $this->helper_object_cache_stats_cmd_get();
+
+		$this->assertSame( $expected_connections, $connections_end - $connections_start );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_option_does_not_hit_the_external_cache_multiple_times_for_the_same_option() {
+		return array(
+			'exists, autoload'       => array( 1, true, true ),
+			'exists, not autoloaded' => array( 3, true, false ),
+			'does not exist'         => array( 3, false ),
+		);
+	}
+
+	/**
+	 * Helper function to get the number of get commands from the external object cache.
+	 *
+	 * @return int|false Number of get command calls, false if unavailable.
+	 */
+	public function helper_object_cache_stats_cmd_get() {
+		if ( ! wp_using_ext_object_cache() || ! function_exists( 'wp_cache_get_stats' ) ) {
+			return false;
+		}
+
+		$stats = wp_cache_get_stats();
+
+		// Check the shape of the stats.
+		if ( ! is_array( $stats ) ) {
+			return false;
+		}
+
+		// Get the first server's stats.
+		$stats = array_shift( $stats );
+
+		if ( ! is_array( $stats ) ) {
+			return false;
+		}
+
+		if ( ! array_key_exists( 'cmd_get', $stats ) ) {
+			return false;
+		}
+
+		return $stats['cmd_get'];
+	}
 }
diff --git a/tests/phpunit/tests/pluggable/signatures.php b/tests/phpunit/tests/pluggable/signatures.php
index 81fd079621916..8ac1dfb6966b6 100644
--- a/tests/phpunit/tests/pluggable/signatures.php
+++ b/tests/phpunit/tests/pluggable/signatures.php
@@ -209,6 +209,7 @@ public function get_pluggable_function_signatures() {
 			'wp_hash'                         => array(
 				'data',
 				'scheme' => 'auth',
+				'algo'   => 'md5',
 			),
 			'wp_hash_password'                => array( 'password' ),
 			'wp_check_password'               => array(
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
index b01ada9be28ff..5fd97a7a71abf 100644
--- a/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
@@ -826,6 +826,47 @@ public function test_get_items_out_of_bounds_page_should_not_error_if_offset() {
 		$this->assertCount( $expected_count, $response->get_data() );
 	}
 
+
+	/**
+	 * Tests for the pagination.
+	 *
+	 * @ticket 62292
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_global_styles_revisions_pagination() {
+		wp_set_current_user( self::$admin_id );
+
+		// Test offset
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_param( 'offset', 1 );
+		$request->set_param( 'per_page', 1 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 1, $data );
+		$this->assertEquals( 3, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( 3, $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test paged
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_param( 'page', 2 );
+		$request->set_param( 'per_page', 2 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 1, $data );
+		$this->assertEquals( 3, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( 2, $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test out of bounds
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_param( 'page', 4 );
+		$request->set_param( 'per_page', 6 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_revision_invalid_page_number', $response, 400 );
+	}
+
 	/**
 	 * @doesNotPerformAssertions
 	 */
diff --git a/tests/phpunit/tests/rest-api/rest-posts-controller.php b/tests/phpunit/tests/rest-api/rest-posts-controller.php
index e2fd7139f3f54..a1b8de0474359 100644
--- a/tests/phpunit/tests/rest-api/rest-posts-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-posts-controller.php
@@ -5676,6 +5676,45 @@ public function test_multiple_post_format_support() {
 		$this->assertCount( 2, $response->get_data(), 'Two posts are expected to be returned' );
 	}
 
+	/**
+	 * Tests for the pagination.
+	 *
+	 * @ticket 62292
+	 *
+	 * @covers WP_REST_Posts_Controller::get_items
+	 */
+	public function test_get_posts_with_pagination() {
+
+		// Test offset
+		$request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+		$request->set_param( 'offset', 1 );
+		$request->set_param( 'per_page', 1 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 1, $data );
+		$this->assertEquals( 30, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( 30, $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test paged
+		$request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+		$request->set_param( 'page', 2 );
+		$request->set_param( 'per_page', 2 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 2, $data );
+		$this->assertEquals( 30, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( 15, $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test out of bounds
+		$request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+		$request->set_param( 'page', 4 );
+		$request->set_param( 'per_page', 10 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_page_number', $response, 400 );
+	}
+
 	/**
 	 * Internal function used to disable an insert query which
 	 * will trigger a wpdb error for testing purposes.
diff --git a/tests/phpunit/tests/rest-api/rest-revisions-controller.php b/tests/phpunit/tests/rest-api/rest-revisions-controller.php
index d2650d31fa852..cdb886c4e47e6 100644
--- a/tests/phpunit/tests/rest-api/rest-revisions-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-revisions-controller.php
@@ -864,4 +864,44 @@ public function test_get_items_out_of_bounds_page_should_not_error_if_offset() {
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertCount( $expected_count, $response->get_data() );
 	}
+
+	/**
+	 * Tests for the pagination.
+	 *
+	 * @ticket 62292
+	 *
+	 * @covers WP_REST_Revisions_Controller::get_items
+	 */
+	public function test_get_template_revisions_pagination() {
+		wp_set_current_user( self::$editor_id );
+
+		// Test offset
+		$request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . self::$post_id . '/revisions' );
+		$request->set_param( 'offset', 1 );
+		$request->set_param( 'per_page', 1 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 1, $data );
+		$this->assertEquals( $this->total_revisions, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( $this->total_revisions, $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test paged
+		$request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . self::$post_id . '/revisions' );
+		$request->set_param( 'page', 2 );
+		$request->set_param( 'per_page', 2 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 1, $data );
+		$this->assertEquals( $this->total_revisions, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( (int) ceil( $this->total_revisions / 2 ), $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test out of bounds
+		$request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . self::$post_id . '/revisions' );
+		$request->set_param( 'page', $this->total_revisions + 1 );
+		$request->set_param( 'per_page', 1 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_revision_invalid_page_number', $response, 400 );
+	}
 }
diff --git a/tests/phpunit/tests/rest-api/wpRestTemplateAutosavesController.php b/tests/phpunit/tests/rest-api/wpRestTemplateAutosavesController.php
index 550eb8e5fe999..e2da442e7d874 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplateAutosavesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplateAutosavesController.php
@@ -22,7 +22,17 @@ class Tests_REST_wpRestTemplateAutosavesController extends WP_Test_REST_Controll
 	/**
 	 * @var string
 	 */
-	const PARENT_POST_TYPE = 'wp_template';
+	const TEMPLATE_PART_NAME = 'my_template_part';
+
+	/**
+	 * @var string
+	 */
+	const TEMPLATE_POST_TYPE = 'wp_template';
+
+	/**
+	 * @var string
+	 */
+	const TEMPLATE_PART_POST_TYPE = 'wp_template_part';
 
 	/**
 	 * Admin user ID.
@@ -52,7 +62,16 @@ class Tests_REST_wpRestTemplateAutosavesController extends WP_Test_REST_Controll
 	private static $template_post;
 
 	/**
-	 * Create fake data before our tests run.
+	 * Template part post.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var WP_Post
+	 */
+	private static $template_part_post;
+
+	/**
+	 * Create fake data before the tests run.
 	 *
 	 * @param WP_UnitTest_Factory $factory Helper that lets us create fake data.
 	 */
@@ -73,9 +92,9 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		// Set up template post.
 		self::$template_post = $factory->post->create_and_get(
 			array(
-				'post_type'    => self::PARENT_POST_TYPE,
+				'post_type'    => self::TEMPLATE_POST_TYPE,
 				'post_name'    => self::TEMPLATE_NAME,
-				'post_title'   => 'My Template',
+				'post_title'   => 'My template',
 				'post_content' => 'Content',
 				'post_excerpt' => 'Description of my template',
 				'tax_input'    => array(
@@ -86,6 +105,27 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 			)
 		);
 		wp_set_post_terms( self::$template_post->ID, self::TEST_THEME, 'wp_theme' );
+
+		// Set up template part post.
+		self::$template_part_post = $factory->post->create_and_get(
+			array(
+				'post_type'    => self::TEMPLATE_PART_POST_TYPE,
+				'post_name'    => self::TEMPLATE_PART_NAME,
+				'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( self::$template_part_post->ID, self::TEST_THEME, 'wp_theme' );
+		wp_set_post_terms( self::$template_part_post->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
 	}
 
 	/**
@@ -117,12 +157,26 @@ public function test_register_routes() {
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::get_context_param
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_context_param() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_context_param_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_context_param_with_data_provider
+	 * @covers WP_REST_Template_Autosaves_Controller::get_context_param
+	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
+	 */
+	public function test_context_param_with_data_provider( $rest_base, $template_id ) {
 		// Collection.
-		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/autosaves' );
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 
@@ -144,7 +198,7 @@ public function test_context_param() {
 		);
 
 		// Single.
-		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/autosaves/1' );
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves/1' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertCount(
@@ -165,25 +219,55 @@ public function test_context_param() {
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::get_items
+	 * Data provider for test_context_param_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_context_param_with_data_provider() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_get_items() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_get_items_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_get_items_with_data_provider
+	 * @covers WP_REST_Template_Autosaves_Controller::get_items
+	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name  A class property name that contains the parent post object.
+	 * @param string $rest_base                  Base part of the REST API endpoint to test.
+	 * @param string $template_id                Template ID to use in the test.
+	 */
+	public function test_get_items_with_data_provider( $parent_post_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
+		// Cannot access this property in the data provider because it is not initialized at the time of execution.
+		$parent_post      = self::$$parent_post_property_name;
 		$autosave_post_id = wp_create_post_autosave(
 			array(
 				'post_content' => 'Autosave content.',
-				'post_ID'      => self::$template_post->ID,
-				'post_type'    => self::PARENT_POST_TYPE,
+				'post_ID'      => $parent_post->ID,
+				'post_type'    => $parent_post->post_type,
 			)
 		);
 
 		$request   = new WP_REST_Request(
 			'GET',
-			'/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/autosaves'
+			'/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves'
 		);
 		$response  = rest_get_server()->dispatch( $request );
 		$autosaves = $response->get_data();
+		$this->assertSame( WP_Http::OK, $response->get_status(), 'Response is expected to have a status code of 200.' );
 
 		$this->assertCount(
 			1,
@@ -197,7 +281,7 @@ public function test_get_items() {
 			'Failed asserting that the ID of the autosave matches the expected autosave post ID.'
 		);
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$autosaves[0]['parent'],
 			'Failed asserting that the parent ID of the autosave matches the template post ID.'
 		);
@@ -209,22 +293,121 @@ public function test_get_items() {
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::get_item
+	 * Data provider for test_get_items_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_items_with_data_provider() {
+		return array(
+			'templates'      => array( 'template_post', 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template_part_post', 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_items_for_templates_based_on_theme_files_should_return_bad_response_status
+	 * @ticket 61970
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
+	 */
+	public function test_get_items_for_templates_based_on_theme_files_should_return_bad_response_status( $rest_base, $template_id ) {
+		wp_set_current_user( self::$admin_id );
+		switch_theme( 'block-theme' );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves' );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse(
+			'rest_invalid_template',
+			$response,
+			WP_Http::BAD_REQUEST,
+			sprintf( 'Response is expected to have a status code of %d.', WP_Http::BAD_REQUEST )
+		);
+	}
+
+	/**
+	 * Data provider for test_get_items_for_templates_based_on_theme_files_should_return_bad_response_status.
+	 *
+	 * @return array
+	 */
+	public function data_get_items_for_templates_based_on_theme_files_should_return_bad_response_status() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//page-home' ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//small-header' ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_item_for_templates_based_on_theme_files_should_return_bad_response_status
+	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
+	 */
+	public function test_get_item_for_templates_based_on_theme_files_should_return_bad_response_status( $rest_base, $template_id ) {
+		wp_set_current_user( self::$admin_id );
+		switch_theme( 'block-theme' );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves/1' );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse(
+			'rest_invalid_template',
+			$response,
+			WP_Http::BAD_REQUEST,
+			sprintf( 'Response is expected to have a status code of %d.', WP_Http::BAD_REQUEST )
+		);
+	}
+
+	/**
+	 * Data provider for test_get_item_for_templates_based_on_theme_files_should_return_bad_response_status.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_for_templates_based_on_theme_files_should_return_bad_response_status() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//page-home' ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//small-header' ),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_get_item() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_get_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_get_item_with_data_provider
+	 * @covers WP_REST_Template_Autosaves_Controller::get_item
+	 * @ticket 56922
+	 *
+	 * @param string  $parent_post_property_name  A class property name that contains the parent post object.
+	 * @param string  $rest_base                  Base part of the REST API endpoint to test.
+	 * @param string  $template_id                Template ID to use in the test.
+	 */
+	public function test_get_item_with_data_provider( $parent_post_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
 
+		$parent_post = self::$$parent_post_property_name;
+
 		$autosave_post_id = wp_create_post_autosave(
 			array(
 				'post_content' => 'Autosave content.',
-				'post_ID'      => self::$template_post->ID,
-				'post_type'    => self::PARENT_POST_TYPE,
+				'post_ID'      => $parent_post->ID,
+				'post_type'    => $parent_post->post_type,
 			)
 		);
 
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/autosaves/' . $autosave_post_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves/' . $autosave_post_id );
 		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertSame( WP_Http::OK, $response->get_status(), 'Response is expected to have a status code of 200.' );
 		$autosave = $response->get_data();
 
 		$this->assertIsArray( $autosave, 'Failed asserting that the autosave is an array.' );
@@ -234,32 +417,59 @@ public function test_get_item() {
 			"Failed asserting that the autosave id is the same as $autosave_post_id."
 		);
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$autosave['parent'],
 			sprintf(
 				'Failed asserting that the parent id of the autosave is the same as %s.',
-				self::$template_post->ID
+				$parent_post->ID
 			)
 		);
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::prepare_item_for_response
+	 * Data provider for test_get_item_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_with_data_provider() {
+		return array(
+			'templates'      => array( 'template_post', 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template_part_post', 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_prepare_item() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_prepare_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_prepare_item_with_data_provider
+	 * @covers WP_REST_Template_Autosaves_Controller::prepare_item_for_response
+	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $rest_base                 Base part of the REST API endpoint to test.
+	 * @param string $template_id               Template ID to use in the test.
+	 */
+	public function test_prepare_item_with_data_provider( $parent_post_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
+		$parent_post      = self::$$parent_post_property_name;
 		$autosave_post_id = wp_create_post_autosave(
 			array(
 				'post_content' => 'Autosave content.',
-				'post_ID'      => self::$template_post->ID,
-				'post_type'    => self::PARENT_POST_TYPE,
+				'post_ID'      => $parent_post->ID,
+				'post_type'    => $parent_post->post_type,
 			)
 		);
 		$autosave_db_post = get_post( $autosave_post_id );
-		$template_id      = self::TEST_THEME . '//' . self::TEMPLATE_NAME;
-		$request          = new WP_REST_Request( 'GET', '/wp/v2/templates/' . $template_id . '/autosaves/' . $autosave_db_post->ID );
-		$controller       = new WP_REST_Template_Autosaves_Controller( self::PARENT_POST_TYPE );
+		$request          = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves/' . $autosave_db_post->ID );
+		$controller       = new WP_REST_Template_Autosaves_Controller( $parent_post->post_type );
 		$response         = $controller->prepare_item_for_response( $autosave_db_post, $request );
 		$this->assertInstanceOf(
 			WP_REST_Response::class,
@@ -275,11 +485,11 @@ public function test_prepare_item() {
 			"Failed asserting that the autosave id is the same as $autosave_db_post->ID."
 		);
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$autosave['parent'],
 			sprintf(
 				'Failed asserting that the parent id of the autosave is the same as %s.',
-				self::$template_post->ID
+				$parent_post->ID
 			)
 		);
 
@@ -300,17 +510,45 @@ public function test_prepare_item() {
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::get_item_schema
+	 * Data provider for test_prepare_item_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_prepare_item_with_data_provider() {
+		return array(
+			'templates'      => array( 'template_post', 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template_part_post', 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_get_item_schema() {
-		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/autosaves' );
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_prepare_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_get_item_schema_with_data_provider
+	 * @covers WP_REST_Template_Autosaves_Controller::get_item_schema
+	 * @ticket 56922
+	 *
+	 * @param string $rest_base             Base part of the REST API endpoint to test.
+	 * @param string $template_id           Template ID to use in the test.
+	 * @param int    $properties_count      Number of properties to check for in the schema.
+	 * @param array  $additional_properties Additional properties to check for in the schema.
+	 */
+	public function test_get_item_schema_with_data_provider( $rest_base, $template_id, $properties_count, $additional_properties = array() ) {
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 
 		$properties = $data['schema']['properties'];
 
-		$this->assertCount( 19, $properties );
+		$this->assertCount( $properties_count, $properties );
 		$this->assertArrayHasKey( 'id', $properties, 'ID key should exist in properties.' );
 		$this->assertArrayHasKey( 'slug', $properties, 'Slug key should exist in properties.' );
 		$this->assertArrayHasKey( 'theme', $properties, 'Theme key should exist in properties.' );
@@ -324,22 +562,58 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'has_theme_file', $properties, 'has_theme_file key should exist in properties.' );
 		$this->assertArrayHasKey( 'author', $properties, 'author key should exist in properties.' );
 		$this->assertArrayHasKey( 'modified', $properties, 'modified key should exist in properties.' );
-		$this->assertArrayHasKey( 'is_custom', $properties, 'is_custom key should exist in properties.' );
 		$this->assertArrayHasKey( 'parent', $properties, 'Parent key should exist in properties.' );
 		$this->assertArrayHasKey( 'author_text', $properties, 'author_text key should exist in properties.' );
 		$this->assertArrayHasKey( 'original_source', $properties, 'original_source key should exist in properties.' );
-		$this->assertArrayHasKey( 'plugin', $properties, 'plugin key should exist in properties.' );
+		foreach ( $additional_properties as $additional_property ) {
+			$this->assertArrayHasKey( $additional_property, $properties, $additional_property . ' key should exist in properties.' );
+		}
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::create_item
+	 * Data provider for test_get_item_schema_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_schema_with_data_provider() {
+		return array(
+			'templates'      => array(
+				'templates',
+				self::TEST_THEME . '//' . self::TEMPLATE_NAME,
+				19,
+				array( 'is_custom', 'plugin' ),
+			),
+			'template parts' => array(
+				'template-parts',
+				self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME,
+				18,
+				array( 'area' ),
+			),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_create_item() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_create_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_create_item_with_data_provider
+	 * @covers WP_REST_Template_Autosaves_Controller::create_item
+	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
+	 */
+	public function test_create_item_with_data_provider( $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
 
-		$template_id = self::TEST_THEME . '/' . self::TEMPLATE_NAME;
-		$request     = new WP_REST_Request( 'POST', '/wp/v2/templates/' . $template_id . '/autosaves' );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves' );
 		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 
 		$request_parameters = array(
@@ -353,41 +627,83 @@ public function test_create_item() {
 		$request->set_body_params( $request_parameters );
 		$response = rest_get_server()->dispatch( $request );
 
-		$this->assertNotWPError( $response, 'The response from this request should not return a WP_Error object' );
+		$this->assertNotWPError( $response, 'The response from this request should not return a WP_Error object.' );
 		$response = rest_ensure_response( $response );
 		$data     = $response->get_data();
 
-		$this->assertArrayHasKey( 'content', $data, 'Response should contain a key called content' );
-		$this->assertSame( $request_parameters['content'], $data['content']['raw'], 'Response data should match for field content' );
+		$this->assertArrayHasKey( 'content', $data, 'Response should contain a key called content.' );
+		$this->assertSame( $request_parameters['content'], $data['content']['raw'], 'Response data should match for field content.' );
 
-		$this->assertArrayHasKey( 'title', $data, 'Response should contain a key called title' );
-		$this->assertSame( $request_parameters['title'], $data['title']['raw'], 'Response data should match for field title' );
+		$this->assertArrayHasKey( 'title', $data, 'Response should contain a key called title.' );
+		$this->assertSame( $request_parameters['title'], $data['title']['raw'], 'Response data should match for field title.' );
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::delete_item
+	 * Data provider for test_create_item_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_create_item_with_data_provider() {
+		return array(
+			'templates'     => array( 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template part' => array( 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_create_item_incorrect_permission
+	 * @covers WP_REST_Template_Autosaves_Controller::create_item_permissions_check
 	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
 	 */
-	public function test_create_item_incorrect_permission() {
+	public function test_create_item_incorrect_permission( $rest_base, $template_id ) {
 		wp_set_current_user( self::$contributor_id );
-		$template_id = self::TEST_THEME . '/' . self::TEMPLATE_NAME;
-		$request     = new WP_REST_Request( 'POST', '/wp/v2/templates/' . $template_id . '/autosaves' );
-		$response    = rest_get_server()->dispatch( $request );
+		$request  = new WP_REST_Request( 'POST', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves' );
+		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_cannot_manage_templates', $response, WP_Http::FORBIDDEN );
 	}
 
 	/**
-	 * @covers WP_REST_Template_Autosaves_Controller::delete_item
+	 * Data provider for test_create_item_incorrect_permission.
+	 *
+	 * @return array
+	 */
+	public function data_create_item_incorrect_permission() {
+		return array(
+			'template'      => array( 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template part' => array( 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_create_item_no_permission
+	 * @covers WP_REST_Template_Autosaves_Controller::create_item_permissions_check
 	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
 	 */
-	public function test_create_item_no_permission() {
+	public function test_create_item_no_permission( $rest_base, $template_id ) {
 		wp_set_current_user( 0 );
-		$template_id = self::TEST_THEME . '/' . self::TEMPLATE_NAME;
-		$request     = new WP_REST_Request( 'POST', '/wp/v2/templates/' . $template_id . '/autosaves' );
-		$response    = rest_get_server()->dispatch( $request );
+		$request  = new WP_REST_Request( 'POST', '/wp/v2/' . $rest_base . '/' . $template_id . '/autosaves' );
+		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_cannot_manage_templates', $response, WP_Http::UNAUTHORIZED );
 	}
 
+	/**
+	 * Data provider for test_create_item_no_permission.
+	 *
+	 * @return array
+	 */
+	public function data_create_item_no_permission() {
+		return array(
+			'template'      => array( 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template part' => array( 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
 	/**
 	 * @coversNothing
 	 * @ticket 56922
diff --git a/tests/phpunit/tests/rest-api/wpRestTemplateRevisionsController.php b/tests/phpunit/tests/rest-api/wpRestTemplateRevisionsController.php
index 014a191f0a13f..23352879f3cfe 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplateRevisionsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplateRevisionsController.php
@@ -27,7 +27,22 @@ class Tests_REST_wpRestTemplateRevisionsController extends WP_Test_REST_Controll
 	/**
 	 * @var string
 	 */
-	const PARENT_POST_TYPE = 'wp_template';
+	const TEMPLATE_PART_NAME = 'my_template_part';
+
+	/**
+	 * @var string
+	 */
+	const TEMPLATE_PART_NAME_2 = 'my_template_part_2';
+
+	/**
+	 * @var string
+	 */
+	const TEMPLATE_POST_TYPE = 'wp_template';
+
+	/**
+	 * @var string
+	 */
+	const TEMPLATE_PART_POST_TYPE = 'wp_template_part';
 
 	/**
 	 * Admin user ID.
@@ -65,10 +80,33 @@ class Tests_REST_wpRestTemplateRevisionsController extends WP_Test_REST_Controll
 	 */
 	private static $template_post_2;
 
+	/**
+	 * Template part post.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var WP_Post
+	 */
+	private static $template_part_post;
+
+	/**
+	 * Template part post.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var WP_Post
+	 */
+	private static $template_part_post_2;
+
 	/**
 	 * @var array
 	 */
-	private static $revisions = array();
+	private static $template_revisions = array();
+
+	/**
+	 * @var array
+	 */
+	private static $template_part_revisions = array();
 
 	/**
 	 * Create fake data before our tests run.
@@ -92,7 +130,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		// Set up template post.
 		self::$template_post = $factory->post->create_and_get(
 			array(
-				'post_type'    => self::PARENT_POST_TYPE,
+				'post_type'    => self::TEMPLATE_POST_TYPE,
 				'post_name'    => self::TEMPLATE_NAME,
 				'post_title'   => 'My Template',
 				'post_content' => 'Content',
@@ -106,54 +144,84 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		);
 		wp_set_post_terms( self::$template_post->ID, self::TEST_THEME, 'wp_theme' );
 
-		// Update post to create a new revisions.
-		self::$revisions[] = _wp_put_post_revision(
-			array(
-				'ID'           => self::$template_post->ID,
-				'post_content' => 'Content revision #2',
-			)
-		);
+		// Update post to create new revisions.
+		foreach ( range( 2, 5 ) as $revision_index ) {
+			self::$template_revisions[] = _wp_put_post_revision(
+				array(
+					'ID'           => self::$template_post->ID,
+					'post_content' => 'Content revision #' . $revision_index,
+				)
+			);
+		}
 
-		// Update post to create a new revisions.
-		self::$revisions[] = _wp_put_post_revision(
+		// Create a new template post to test the get_item method.
+		self::$template_post_2 = $factory->post->create_and_get(
 			array(
-				'ID'           => self::$template_post->ID,
-				'post_content' => 'Content revision #3',
+				'post_type'    => self::TEMPLATE_POST_TYPE,
+				'post_name'    => self::TEMPLATE_NAME_2,
+				'post_title'   => 'My Template 2',
+				'post_content' => 'Content 2',
+				'post_excerpt' => 'Description of my template 2',
+				'tax_input'    => array(
+					'wp_theme' => array(
+						self::TEST_THEME,
+					),
+				),
 			)
 		);
+		wp_set_post_terms( self::$template_post_2->ID, self::TEST_THEME, 'wp_theme' );
 
-		// Update post to create a new revisions.
-		self::$revisions[] = _wp_put_post_revision(
+		// Set up template part post.
+		self::$template_part_post = $factory->post->create_and_get(
 			array(
-				'ID'           => self::$template_post->ID,
-				'post_content' => 'Content revision #4',
+				'post_type'    => self::TEMPLATE_PART_POST_TYPE,
+				'post_name'    => self::TEMPLATE_PART_NAME,
+				'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( self::$template_part_post->ID, self::TEST_THEME, 'wp_theme' );
+		wp_set_post_terms( self::$template_part_post->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
 
-		// Update post to create a new revisions.
-		self::$revisions[] = _wp_put_post_revision(
-			array(
-				'ID'           => self::$template_post->ID,
-				'post_content' => 'Content revision #5',
-			)
-		);
+		// Update post to create new revisions.
+		foreach ( range( 2, 5 ) as $revision_index ) {
+			self::$template_part_revisions[] = _wp_put_post_revision(
+				array(
+					'ID'           => self::$template_part_post->ID,
+					'post_content' => 'Content revision #' . $revision_index,
+				)
+			);
+		}
 
-		// Create a new template post to test the get_item method.
-		self::$template_post_2 = $factory->post->create_and_get(
+		// Set up template part post.
+		self::$template_part_post_2 = $factory->post->create_and_get(
 			array(
-				'post_type'    => self::PARENT_POST_TYPE,
-				'post_name'    => self::TEMPLATE_NAME_2,
-				'post_title'   => 'My Template 2',
+				'post_type'    => self::TEMPLATE_PART_POST_TYPE,
+				'post_name'    => self::TEMPLATE_PART_NAME_2,
+				'post_title'   => 'My template part 2',
 				'post_content' => 'Content 2',
-				'post_excerpt' => 'Description of my template 2',
+				'post_excerpt' => 'Description of my template part 2',
 				'tax_input'    => array(
-					'wp_theme' => array(
+					'wp_theme'              => array(
 						self::TEST_THEME,
 					),
+					'wp_template_part_area' => array(
+						WP_TEMPLATE_PART_AREA_HEADER,
+					),
 				),
 			)
 		);
-		wp_set_post_terms( self::$template_post_2->ID, self::TEST_THEME, 'wp_theme' );
+		wp_set_post_terms( self::$template_part_post_2->ID, self::TEST_THEME, 'wp_theme' );
+		wp_set_post_terms( self::$template_part_post_2->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
 	}
 
 	/**
@@ -161,8 +229,12 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	 */
 	public static function wpTearDownAfterClass() {
 		// Also deletes revisions.
-		foreach ( self::$revisions as $revision ) {
-			wp_delete_post( $revision, true );
+		foreach ( self::$template_revisions as $template_revision ) {
+			wp_delete_post( $template_revision, true );
+		}
+
+		foreach ( self::$template_part_revisions as $template_part_revision ) {
+			wp_delete_post( $template_part_revision, true );
 		}
 	}
 
@@ -195,12 +267,26 @@ public function test_register_routes() {
 	}
 
 	/**
-	 * @covers WP_REST_Template_Revisions_Controller::get_context_param
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_context_param() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_context_param_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_context_param_with_data_provider
+	 * @covers WP_REST_Template_Revisions_Controller::get_context_param
+	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
+	 */
+	public function test_context_param_with_data_provider( $rest_base, $template_id ) {
 		// Collection.
-		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions' );
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertSame(
@@ -215,7 +301,7 @@ public function test_context_param() {
 		);
 
 		// Single.
-		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions/1' );
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/1' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertCount(
@@ -236,17 +322,47 @@ public function test_context_param() {
 	}
 
 	/**
-	 * @covers WP_REST_Template_Revisions_Controller::get_items
+	 * Data provider for test_context_param.
+	 *
+	 * @return array
+	 */
+	public function data_context_param_with_data_provider() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_get_items() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_get_items_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_get_items_with_data_provider
+	 * @covers WP_REST_Template_Revisions_Controller::get_items
+	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $rest_base                 Base part of the REST API endpoint to test.
+	 * @param string $template_id               Template ID to use in the test.
+	 */
+	public function test_get_items_with_data_provider( $parent_post_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
+		$parent_post = self::$$parent_post_property_name;
+
 		$request   = new WP_REST_Request(
 			'GET',
-			'/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions'
+			'/wp/v2/' . $rest_base . '/' . $template_id . '/revisions'
 		);
 		$response  = rest_get_server()->dispatch( $request );
 		$revisions = $response->get_data();
+		$this->assertSame( WP_Http::OK, $response->get_status(), 'Response is expected to have a status code of 200.' );
 
 		$this->assertCount(
 			4,
@@ -255,7 +371,7 @@ public function test_get_items() {
 		);
 
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$revisions[0]['parent'],
 			'Failed asserting that the parent ID of the revision matches the template post ID.'
 		);
@@ -266,7 +382,7 @@ public function test_get_items() {
 		);
 
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$revisions[1]['parent'],
 			'Failed asserting that the parent ID of the revision matches the template post ID.'
 		);
@@ -277,7 +393,7 @@ public function test_get_items() {
 		);
 
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$revisions[2]['parent'],
 			'Failed asserting that the parent ID of the revision matches the template post ID.'
 		);
@@ -288,7 +404,7 @@ public function test_get_items() {
 		);
 
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$revisions[3]['parent'],
 			'Failed asserting that the parent ID of the revision matches the template post ID.'
 		);
@@ -299,40 +415,168 @@ public function test_get_items() {
 		);
 	}
 
+	/**
+	 * Data provider for test_get_items_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_items_with_data_provider() {
+		return array(
+			'templates'      => array( 'template_post', 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template_part_post', 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
 
 	/**
+	 * @dataProvider data_get_items_endpoint_should_return_unauthorized_https_status_code_for_unauthorized_request
 	 * @covers WP_REST_Template_Revisions_Controller::get_items_permissions_check
 	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
 	 */
-	public function test_get_items_endpoint_should_return_unauthorized_https_status_code_for_unauthorized_request() {
+	public function test_get_items_endpoint_should_return_unauthorized_https_status_code_for_unauthorized_request( $rest_base, $template_id ) {
 		wp_set_current_user( 0 );
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions' );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions' );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_cannot_read', $response, WP_Http::UNAUTHORIZED );
 	}
 
 	/**
+	 * Data provider for test_get_items_endpoint_should_return_unauthorized_https_status_code_for_unauthorized_request.
+	 *
+	 * @return array
+	 */
+	public function data_get_items_endpoint_should_return_unauthorized_https_status_code_for_unauthorized_request() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_items_endpoint_should_return_forbidden_https_status_code_for_users_with_insufficient_permissions
 	 * @covers WP_REST_Template_Revisions_Controller::get_items_permissions_check
 	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
 	 */
-	public function test_get_items_endpoint_should_return_forbidden_https_status_code_for_users_with_insufficient_permissions() {
+	public function test_get_items_endpoint_should_return_forbidden_https_status_code_for_users_with_insufficient_permissions( $rest_base, string $template_id ) {
 		wp_set_current_user( self::$contributor_id );
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions' );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions' );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_cannot_read', $response, WP_Http::FORBIDDEN );
 	}
 
 	/**
-	 * @covers WP_REST_Template_Revisions_Controller::get_item
+	 * Data provider for test_get_items_endpoint_should_return_unauthorized_https_status_code_for_unauthorized_request.
+	 *
+	 * @return array
+	 */
+	public function data_get_items_endpoint_should_return_forbidden_https_status_code_for_users_with_insufficient_permissions() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_items_for_templates_based_on_theme_files_should_return_bad_response_status
+	 * @ticket 61970
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
+	 */
+	public function test_get_items_for_templates_based_on_theme_files_should_return_bad_response_status( $rest_base, $template_id ) {
+		wp_set_current_user( self::$admin_id );
+		switch_theme( 'block-theme' );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions' );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse(
+			'rest_invalid_template',
+			$response,
+			WP_Http::BAD_REQUEST,
+			sprintf( 'Response is expected to have a status code of %d.', WP_Http::BAD_REQUEST )
+		);
+	}
+
+	/**
+	 * Data provider for test_get_items_for_templates_based_on_theme_files_should_return_bad_response_status.
+	 *
+	 * @return array
+	 */
+	public function data_get_items_for_templates_based_on_theme_files_should_return_bad_response_status() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//page-home' ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//small-header' ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_item_for_templates_based_on_theme_files_should_return_bad_response_status
+	 * @ticket 56922
+	 *
+	 * @param string $rest_base   Base part of the REST API endpoint to test.
+	 * @param string $template_id Template ID to use in the test.
+	 */
+	public function test_get_item_for_templates_based_on_theme_files_should_return_bad_response_status( $rest_base, $template_id ) {
+		wp_set_current_user( self::$admin_id );
+		switch_theme( 'block-theme' );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/1' );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse(
+			'rest_invalid_template',
+			$response,
+			WP_Http::BAD_REQUEST,
+			sprintf( 'Response is expected to have a status code of %d.', WP_Http::BAD_REQUEST )
+		);
+	}
+
+	/**
+	 * Data provider for test_get_item_for_templates_based_on_theme_files_should_return_bad_response_status.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_for_templates_based_on_theme_files_should_return_bad_response_status() {
+		return array(
+			'templates'      => array( 'templates', self::TEST_THEME . '//page-home' ),
+			'template parts' => array( 'template-parts', self::TEST_THEME . '//small-header' ),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_get_item() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_get_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_get_item_with_data_provider
+	 * @covers WP_REST_Template_Revisions_Controller::get_item
+	 * @ticket 56922
+	 *
+	 * @param string  $parent_post_property_name  A class property name that contains the parent post object.
+	 * @param string  $rest_base                  Base part of the REST API endpoint to test.
+	 * @param string  $template_id                Template ID to use in the test.
+	 */
+	public function test_get_item_with_data_provider( $parent_post_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
 
-		$revisions   = wp_get_post_revisions( self::$template_post, array( 'fields' => 'ids' ) );
+		$parent_post = self::$$parent_post_property_name;
+
+		$revisions   = wp_get_post_revisions( $parent_post, array( 'fields' => 'ids' ) );
 		$revision_id = array_shift( $revisions );
 
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions/' . $revision_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/' . $revision_id );
 		$response = rest_get_server()->dispatch( $request );
 		$revision = $response->get_data();
 
@@ -343,7 +587,7 @@ public function test_get_item() {
 			"Failed asserting that the revision id is the same as $revision_id"
 		);
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$revision['parent'],
 			sprintf(
 				'Failed asserting that the parent id of the revision is the same as %s.',
@@ -353,47 +597,125 @@ public function test_get_item() {
 	}
 
 	/**
+	 * Data provider for test_get_item_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_with_data_provider() {
+		return array(
+			'templates'      => array( 'template_post', 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template_part_post', 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_item_not_found
 	 * @covers WP_REST_Template_Revisions_Controller::get_item
 	 * @ticket 56922
+	 *
+	 * @param string  $parent_post_property_name  A class property name that contains the parent post object.
+	 * @param string  $rest_base                  Base part of the REST API endpoint to test.
 	 */
-	public function test_get_item_not_found() {
+	public function test_get_item_not_found( $parent_post_property_name, $rest_base ) {
 		wp_set_current_user( self::$admin_id );
 
-		$revisions   = wp_get_post_revisions( self::$template_post, array( 'fields' => 'ids' ) );
+		$parent_post = self::$$parent_post_property_name;
+
+		$revisions   = wp_get_post_revisions( $parent_post, array( 'fields' => 'ids' ) );
 		$revision_id = array_shift( $revisions );
 
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/invalid//parent/revisions/' . $revision_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/invalid//parent/revisions/' . $revision_id );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_post_invalid_parent', $response, WP_Http::NOT_FOUND );
 	}
 
 	/**
+	 * Data provider for test_get_item_not_found.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_not_found() {
+		return array(
+			'templates'      => array( 'template_post', 'templates' ),
+			'template parts' => array( 'template_part_post', 'template-parts' ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_item_invalid_parent_id
+	 * @covers WP_REST_Template_Revisions_Controller::get_item
 	 * @ticket 59875
+	 *
+	 * @param string $parent_post_property_name        A class property name that contains the parent post object.
+	 * @param string $actual_parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $rest_base                        Base part of the REST API endpoint to test.
+	 * @param string $template_id                      Template ID to use in the test.
 	 */
-	public function test_get_item_invalid_parent_id() {
+	public function test_get_item_invalid_parent_id( $parent_post_property_name, $actual_parent_post_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
-		$revisions   = wp_get_post_revisions( self::$template_post, array( 'fields' => 'ids' ) );
-		$revision_id = array_shift( $revisions );
 
-		$request = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME_2 . '/revisions/' . $revision_id );
+		$parent_post        = self::$$parent_post_property_name;
+		$actual_parent_post = self::$$actual_parent_post_property_name;
+		$revisions          = wp_get_post_revisions( $parent_post, array( 'fields' => 'ids' ) );
+		$revision_id        = array_shift( $revisions );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/' . $revision_id );
 
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_revision_parent_id_mismatch', $response, 404 );
 
-		$expected_message = 'The revision does not belong to the specified parent with id of "' . self::$template_post_2->ID . '"';
+		$expected_message = 'The revision does not belong to the specified parent with id of "' . $actual_parent_post->ID . '"';
 		$this->assertSame( $expected_message, $response->as_error()->get_error_messages()[0], 'The message must contain the correct parent ID.' );
 	}
 
 	/**
-	 * @covers WP_REST_Template_Revisions_Controller::prepare_item_for_response
+	 * Data provider for test_get_item_invalid_parent_id.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_invalid_parent_id() {
+		return array(
+			'templates'      => array(
+				'template_post',
+				'template_post_2',
+				'templates',
+				self::TEST_THEME . '//' . self::TEMPLATE_NAME_2,
+			),
+			'template parts' => array(
+				'template_part_post',
+				'template_part_post_2',
+				'template-parts',
+				self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME_2,
+			),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_prepare_item() {
-		$revisions   = wp_get_post_revisions( self::$template_post, array( 'fields' => 'ids' ) );
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_prepare_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_prepare_item_with_data_provider
+	 * @covers WP_REST_Template_Revisions_Controller::prepare_item_for_response
+	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $rest_base                 Base part of the REST API endpoint to test.
+	 * @param string $template_id               Template ID to use in the test.
+	 */
+	public function test_prepare_item_with_data_provider( $parent_post_property_name, $rest_base, $template_id ) {
+		$parent_post = self::$$parent_post_property_name;
+		$revisions   = wp_get_post_revisions( $parent_post, array( 'fields' => 'ids' ) );
 		$revision_id = array_shift( $revisions );
 		$post        = get_post( $revision_id );
-		$request     = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions/' . $revision_id );
-		$controller  = new WP_REST_Template_Revisions_Controller( self::PARENT_POST_TYPE );
+		$request     = new WP_REST_Request( 'GET', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/' . $revision_id );
+		$controller  = new WP_REST_Template_Revisions_Controller( $parent_post->post_type );
 		$response    = $controller->prepare_item_for_response( $post, $request );
 		$this->assertInstanceOf(
 			WP_REST_Response::class,
@@ -409,11 +731,11 @@ public function test_prepare_item() {
 			"Failed asserting that the revision id is the same as $revision_id."
 		);
 		$this->assertSame(
-			self::$template_post->ID,
+			$parent_post->ID,
 			$revision['parent'],
 			sprintf(
 				'Failed asserting that the parent id of the revision is the same as %s.',
-				self::$template_post->ID
+				$parent_post->ID
 			)
 		);
 
@@ -421,35 +743,63 @@ public function test_prepare_item() {
 		$this->assertIsArray( $links, 'Failed asserting that the links are an array.' );
 
 		$this->assertStringEndsWith(
-			self::TEST_THEME . '//' . self::TEMPLATE_NAME . '/revisions/' . $revision_id,
+			$template_id . '/revisions/' . $revision_id,
 			$links['self'][0]['href'],
 			sprintf(
 				'Failed asserting that the self link ends with %s.',
-				self::TEST_THEME . '//' . self::TEMPLATE_NAME . '/revisions/' . $revision_id
+				$template_id . '/revisions/' . $revision_id
 			)
 		);
 
 		$this->assertStringEndsWith(
-			self::TEST_THEME . '//' . self::TEMPLATE_NAME,
+			$template_id,
 			$links['parent'][0]['href'],
 			sprintf(
 				'Failed asserting that the parent link ends with %s.',
-				self::TEST_THEME . '//' . self::TEMPLATE_NAME
+				$template_id
 			)
 		);
 	}
 
 	/**
-	 * @covers WP_REST_Template_Revisions_Controller::get_item_schema
+	 * Data provider for test_prepare_item_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_prepare_item_with_data_provider() {
+		return array(
+			'templates'      => array( 'template_post', 'templates', self::TEST_THEME . '//' . self::TEMPLATE_NAME ),
+			'template parts' => array( 'template_part_post', 'template-parts', self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME ),
+		);
+	}
+
+	/**
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_get_item_schema() {
-		$request    = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions' );
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_prepare_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_get_item_schema_with_data_provider
+	 * @covers WP_REST_Template_Revisions_Controller::get_item_schema
+	 * @ticket 56922
+	 *
+	 * @param string $rest_base             Base part of the REST API endpoint to test.
+	 * @param string $template_id           Template ID to use in the test.
+	 * @param int    $properties_count      Number of properties to check for in the schema.
+	 * @param array  $additional_properties Additional properties to check for in the schema.
+	 */
+	public function test_get_item_schema_with_data_provider( $rest_base, $template_id, $properties_count, $additional_properties = array() ) {
+		$request    = new WP_REST_Request( 'OPTIONS', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions' );
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
 
-		$this->assertCount( 19, $properties );
+		$this->assertCount( $properties_count, $properties );
 		$this->assertArrayHasKey( 'id', $properties, 'ID key should exist in properties.' );
 		$this->assertArrayHasKey( 'slug', $properties, 'Slug key should exist in properties.' );
 		$this->assertArrayHasKey( 'theme', $properties, 'Theme key should exist in properties.' );
@@ -463,11 +813,35 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'has_theme_file', $properties, 'has_theme_file key should exist in properties.' );
 		$this->assertArrayHasKey( 'author', $properties, 'author key should exist in properties.' );
 		$this->assertArrayHasKey( 'modified', $properties, 'modified key should exist in properties.' );
-		$this->assertArrayHasKey( 'is_custom', $properties, 'is_custom key should exist in properties.' );
 		$this->assertArrayHasKey( 'parent', $properties, 'Parent key should exist in properties.' );
 		$this->assertArrayHasKey( 'author_text', $properties, 'author_text key should exist in properties.' );
 		$this->assertArrayHasKey( 'original_source', $properties, 'original_source key should exist in properties.' );
-		$this->assertArrayHasKey( 'plugin', $properties, 'plugin key should exist in properties.' );
+
+		foreach ( $additional_properties as $additional_property ) {
+			$this->assertArrayHasKey( $additional_property, $properties, $additional_property . ' key should exist in properties.' );
+		}
+	}
+
+	/**
+	 * Data provider for data_get_item_schema_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_item_schema_with_data_provider() {
+		return array(
+			'templates'      => array(
+				'templates',
+				self::TEST_THEME . '//' . self::TEMPLATE_NAME,
+				19,
+				array( 'is_custom', 'plugin' ),
+			),
+			'template parts' => array(
+				'template-parts',
+				self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME,
+				18,
+				array( 'area' ),
+			),
+		);
 	}
 
 	/**
@@ -497,16 +871,35 @@ public function test_update_item() {
 	}
 
 	/**
-	 * @covers WP_REST_Templates_Controller::delete_item
+	 * @coversNothing
 	 * @ticket 56922
 	 */
 	public function test_delete_item() {
+		// A proper data provider cannot be used because this method's signature must match the parent method.
+		// Therefore, actual tests are performed in the test_delete_item_with_data_provider method.
+		$this->assertTrue( true );
+	}
+
+	/**
+	 * @dataProvider data_delete_item_with_data_provider
+	 * @covers WP_REST_Templates_Controller::delete_item
+	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $revisions_property_name   A class property name that contains the revisions array.
+	 * @param string $rest_base                 Base part of the REST API endpoint to test.
+	 * @param string $template_id               Template ID to use in the test.
+	 */
+	public function test_delete_item_with_data_provider( $parent_post_property_name, $revisions_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$admin_id );
 
-		$revision_id       = _wp_put_post_revision( self::$template_post );
-		self::$revisions[] = $revision_id;
+		$parent_post = self::$$parent_post_property_name;
+		$revisions   = self::$$revisions_property_name;
+
+		$revision_id = _wp_put_post_revision( $parent_post );
+		$revisions[] = $revision_id;
 
-		$request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions/' . $revision_id );
+		$request = new WP_REST_Request( 'DELETE', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/' . $revision_id );
 		$request->set_param( 'force', true );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -515,48 +908,201 @@ public function test_delete_item() {
 	}
 
 	/**
+	 * Data provider for test_delete_item_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_delete_item_with_data_provider() {
+		return array(
+			'templates'      => array(
+				'template_post',
+				'template_revisions',
+				'templates',
+				self::TEST_THEME . '//' . self::TEMPLATE_NAME,
+			),
+			'template parts' => array(
+				'template_part_post',
+				'template_part_revisions',
+				'template-parts',
+				self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME,
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_delete_item_incorrect_permission
 	 * @covers WP_REST_Templates_Controller::delete_item
 	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $revisions_property_name   A class property name that contains the revisions array.
+	 * @param string $rest_base                 Base part of the REST API endpoint to test.
+	 * @param string $template_id               Template ID to use in the test.
 	 */
-	public function test_delete_item_incorrect_permission() {
+	public function test_delete_item_incorrect_permission( $parent_post_property_name, $revisions_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( self::$contributor_id );
-		$revision_id       = _wp_put_post_revision( self::$template_post );
-		self::$revisions[] = $revision_id;
+		$parent_post = self::$$parent_post_property_name;
+		$revisions   = self::$$revisions_property_name;
+
+		$revision_id = _wp_put_post_revision( $parent_post );
+		$revisions[] = $revision_id;
 
-		$request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions/' . $revision_id );
+		$request = new WP_REST_Request( 'DELETE', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/' . $revision_id );
 		$request->set_param( 'force', true );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_cannot_delete', $response, WP_Http::FORBIDDEN );
 	}
 
 	/**
+	 * Data provider for test_delete_item_with_data_provider.
+	 *
+	 * @return array
+	 */
+	public function data_delete_item_incorrect_permission() {
+		return array(
+			'templates'      => array(
+				'template_post',
+				'template_revisions',
+				'templates',
+				self::TEST_THEME . '//' . self::TEMPLATE_NAME,
+			),
+			'template parts' => array(
+				'template_part_post',
+				'template_part_revisions',
+				'template-parts',
+				self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME,
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_delete_item_no_permission
 	 * @covers WP_REST_Templates_Controller::delete_item
 	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $revisions_property_name   A class property name that contains the revisions array.
+	 * @param string $rest_base                 Base part of the REST API endpoint to test.
+	 * @param string $template_id               Template ID to use in the test.
 	 */
-	public function test_delete_item_no_permission() {
+	public function test_delete_item_no_permission( $parent_post_property_name, $revisions_property_name, $rest_base, $template_id ) {
 		wp_set_current_user( 0 );
-		$revision_id       = _wp_put_post_revision( self::$template_post );
-		self::$revisions[] = $revision_id;
 
-		$request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions/' . $revision_id );
+		$parent_post = self::$$parent_post_property_name;
+		$revisions   = self::$$revisions_property_name;
+
+		$revision_id = _wp_put_post_revision( $parent_post );
+		$revisions[] = $revision_id;
+
+		$request = new WP_REST_Request( 'DELETE', '/wp/v2/' . $rest_base . '/' . $template_id . '/revisions/' . $revision_id );
 		$request->set_param( 'force', true );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_cannot_delete', $response, WP_Http::UNAUTHORIZED );
 	}
 
 	/**
+	 * Data provider for test_delete_item_no_permission.
+	 *
+	 * @return array
+	 */
+	public function data_delete_item_no_permission() {
+		return array(
+			'templates'      => array(
+				'template_post',
+				'template_revisions',
+				'templates',
+				self::TEST_THEME . '//' . self::TEMPLATE_NAME,
+			),
+			'template parts' => array(
+				'template_part_post',
+				'template_part_revisions',
+				'template-parts',
+				self::TEST_THEME . '//' . self::TEMPLATE_PART_NAME,
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_delete_item_not_found
 	 * @covers WP_REST_Template_Revisions_Controller::get_item
 	 * @ticket 56922
+	 *
+	 * @param string $parent_post_property_name A class property name that contains the parent post object.
+	 * @param string $revisions_property_name   A class property name that contains the revisions array.
+	 * @param string $rest_base                 Base part of the REST API endpoint to test.
 	 */
-	public function test_delete_item_not_found() {
+	public function test_delete_item_not_found( $parent_post_property_name, $revisions_property_name, $rest_base ) {
 		wp_set_current_user( self::$admin_id );
 
-		$revision_id       = _wp_put_post_revision( self::$template_post );
-		self::$revisions[] = $revision_id;
+		$parent_post = self::$$parent_post_property_name;
+		$revisions   = self::$$revisions_property_name;
+
+		$revision_id = _wp_put_post_revision( $parent_post );
+		$revisions[] = $revision_id;
 
-		$request = new WP_REST_Request( 'DELETE', '/wp/v2/templates/invalid//parent/revisions/' . $revision_id );
+		$request = new WP_REST_Request( 'DELETE', '/wp/v2/' . $rest_base . '/invalid//parent/revisions/' . $revision_id );
 		$request->set_param( 'force', true );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_post_invalid_parent', $response, WP_Http::NOT_FOUND );
 	}
+
+	/**
+	 * Data provider for test_delete_item_not_found.
+	 *
+	 * @return array
+	 */
+	public function data_delete_item_not_found() {
+		return array(
+			'templates'      => array(
+				'template_post',
+				'template_revisions',
+				'templates',
+			),
+			'template parts' => array(
+				'template_part_post',
+				'template_part_revisions',
+				'template-parts',
+			),
+		);
+	}
+
+	/**
+	 * Tests for the pagination.
+	 *
+	 * @ticket 62292
+	 *
+	 * @covers WP_REST_Template_Revisions_Controller::get_items
+	 */
+	public function test_get_template_revisions_pagination() {
+		wp_set_current_user( self::$admin_id );
+
+		// Test offset
+		$request = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions' );
+		$request->set_param( 'offset', 1 );
+		$request->set_param( 'per_page', 1 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 1, $data );
+		$this->assertEquals( 4, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( 4, $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test paged
+		$request = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions' );
+		$request->set_param( 'page', 2 );
+		$request->set_param( 'per_page', 2 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertCount( 2, $data );
+		$this->assertEquals( 4, $response->get_headers()['X-WP-Total'] );
+		$this->assertEquals( 2, $response->get_headers()['X-WP-TotalPages'] );
+
+		// Test out of bounds
+		$request = new WP_REST_Request( 'GET', '/wp/v2/templates/' . self::TEST_THEME . '/' . self::TEMPLATE_NAME . '/revisions' );
+		$request->set_param( 'page', 4 );
+		$request->set_param( 'per_page', 6 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_revision_invalid_page_number', $response, 400 );
+	}
 }
diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php
index 248aaa833a02f..c18c4d434f44b 100644
--- a/tests/phpunit/tests/theme.php
+++ b/tests/phpunit/tests/theme.php
@@ -302,36 +302,38 @@ public function test_default_themes_have_textdomain() {
 
 	/**
 	 * @ticket 48566
+	 *
+	 * @dataProvider data_year_in_readme
 	 */
-	public function test_year_in_readme() {
+	public function test_year_in_readme( $theme ) {
 		// This test is designed to only run on trunk.
 		$this->skipOnAutomatedBranches();
 
-		foreach ( $this->default_themes as $theme ) {
-			$wp_theme = wp_get_theme( $theme );
-
-			$path_to_readme_txt = $wp_theme->get_theme_root() . '/' . $wp_theme->get_stylesheet() . '/readme.txt';
-			$this->assertFileExists( $path_to_readme_txt );
+		$wp_theme = wp_get_theme( $theme );
 
-			$readme    = file_get_contents( $path_to_readme_txt );
-			$this_year = gmdate( 'Y' );
+		$path_to_readme_txt = $wp_theme->get_theme_root() . '/' . $wp_theme->get_stylesheet() . '/readme.txt';
+		$this->assertFileExists( $path_to_readme_txt );
 
-			preg_match( '#Copyright (\d+) WordPress.org#', $readme, $matches );
-			if ( $matches ) {
-				$readme_year = trim( $matches[1] );
+		$readme    = file_get_contents( $path_to_readme_txt );
+		$this_year = gmdate( 'Y' );
 
-				$this->assertSame( $this_year, $readme_year, "Bundled themes readme.txt's year needs to be updated to $this_year." );
-			}
-
-			preg_match( '#Copyright 20\d\d-(\d+) WordPress.org#', $readme, $matches );
-			if ( $matches ) {
-				$readme_year = trim( $matches[1] );
+		preg_match( '#(Copyright|\(C\)) (20\d\d-)?(\d+) WordPress.org#i', $readme, $matches );
+		if ( $matches ) {
+			$readme_year = trim( $matches[3] );
 
-				$this->assertSame( $this_year, $readme_year, "Bundled themes readme.txt's year needs to be updated to $this_year." );
-			}
+			$this->assertSame( $this_year, $readme_year, "$theme readme.txt's year needs to be updated to $this_year." );
 		}
 	}
 
+	public function data_year_in_readme() {
+		return array_map(
+			static function ( $theme ) {
+				return array( $theme );
+			},
+			$this->default_themes
+		);
+	}
+
 	/**
 	 * @ticket 20897
 	 * @expectedDeprecated get_theme_data