diff --git a/.github/workflows/test_e2e_deploy_release.yml b/.github/workflows/test_e2e_deploy_release.yml
index 3692688accdf..a1572222f843 100644
--- a/.github/workflows/test_e2e_deploy_release.yml
+++ b/.github/workflows/test_e2e_deploy_release.yml
@@ -136,6 +136,40 @@ jobs:
           retention-days: 5
           if-no-files-found: error
 
+      # Runs last in setup so the steps above overlap with npm propagation.
+      - name: wait-for-published-next
+        env:
+          # The spec that comes after `next@` when the deploy tests install
+          # it: a dist-tag, an exact version, or a tarball URL.
+          NEXT_VERSION_SPEC: ${{ steps.version.outputs.value }}
+          POLL_TIMEOUT_SECONDS: 900
+          POLL_INTERVAL_SECONDS: 15
+        run: |
+          set -euo pipefail
+
+          if [[ "$NEXT_VERSION_SPEC" == http* ]]; then
+            echo "next@$NEXT_VERSION_SPEC is a tarball URL, skipping npm availability check"
+            exit 0
+          fi
+
+          deadline=$((SECONDS + POLL_TIMEOUT_SECONDS))
+          attempt=1
+          while true; do
+            if resolved="$(pnpm view "next@$NEXT_VERSION_SPEC" version)"; then
+              echo "next@$NEXT_VERSION_SPEC is available on npm (resolved to $resolved, attempt $attempt)"
+              break
+            fi
+
+            if (( SECONDS >= deadline )); then
+              echo "::error::Timed out after ${POLL_TIMEOUT_SECONDS}s waiting for next@$NEXT_VERSION_SPEC to become available on npm"
+              exit 1
+            fi
+
+            echo "next@$NEXT_VERSION_SPEC is not available on npm yet (attempt $attempt), retrying in ${POLL_INTERVAL_SECONDS}s"
+            sleep "$POLL_INTERVAL_SECONDS"
+            attempt=$((attempt + 1))
+          done
+
   test-deploy-webpack:
     name: Run Deploy Tests (Webpack)
     needs: setup
diff --git a/contributing/core/developing.md b/contributing/core/developing.md
index 544d8589df72..68e2cfcdf5c0 100644
--- a/contributing/core/developing.md
+++ b/contributing/core/developing.md
@@ -168,7 +168,7 @@ $ pnpm unpack-next path/to/project
 
 ## Developing the Dev Overlay
 
-The dev overlay is a feature of Next.js that allows you to see the internal state of the app including the errors. To learn more about contributing to the dev overlay, see the [Dev Overlay README.md](../../packages/next/src/client/components/react-dev-overlay/README.md).
+The dev overlay is a feature of Next.js that allows you to see the internal state of the app including the errors. To learn more about contributing to the dev overlay, see the [Dev Overlay README.md](../../packages/next/src/next-devtools/README.md).
 
 ## `NODE_ENV` vs `__NEXT_DEV_SERVER`
 
diff --git a/docs/01-app/02-guides/caching-without-cache-components.mdx b/docs/01-app/02-guides/caching-without-cache-components.mdx
index 5555e7d905c8..af27fcd8c5b4 100644
--- a/docs/01-app/02-guides/caching-without-cache-components.mdx
+++ b/docs/01-app/02-guides/caching-without-cache-components.mdx
@@ -108,7 +108,7 @@ export const dynamic = 'auto'
 <details>
   <summary>This is an advanced option that should only be used if you specifically need to override the default behavior.</summary>
 
-By default, Next.js **will cache** any `fetch()` requests that are reachable **before** any Request-time APIs are used and **will not cache** `fetch` requests that are discovered **after** Request-time APIs are used.
+A `fetch` request that sets no `cache` option is fetched once during `next build` if it is reachable **before** any Request-time APIs are used, because the route is prerendered up to that point. Requests discovered **after** a Request-time API run on every request.
 
 `fetchCache` allows you to override the default `cache` option of all `fetch` requests in a layout or page.
 
diff --git a/docs/01-app/02-guides/upgrading/version-16.mdx b/docs/01-app/02-guides/upgrading/version-16.mdx
index 4ca2411d98cf..0bd34e3d0298 100644
--- a/docs/01-app/02-guides/upgrading/version-16.mdx
+++ b/docs/01-app/02-guides/upgrading/version-16.mdx
@@ -276,7 +276,7 @@ export default nextConfig
 
 ### Turbopack File System Caching
 
-Turbopack stores compiler artifacts on disk between runs, for significantly faster compile times across restarts. Filesystem caching is enabled by default for both `next dev` and `next build`. See [`turbopackFileSystemCache`](/docs/app/api-reference/config/next-config-js/turbopackFileSystemCache) to configure or disable it.
+Turbopack stores compiler artifacts on disk between runs, for significantly faster compile times across restarts. Filesystem caching is enabled by default for both `next dev` and `next build`, through `experimental.turbopackFileSystemCacheForDev` and `experimental.turbopackFileSystemCacheForBuild`. See [Turbopack FileSystem Caching](/docs/app/api-reference/config/next-config-js/turbopackFileSystemCache) to configure or disable either one.
 
 ## Async Request APIs (Breaking change)
 
@@ -1074,7 +1074,7 @@ const nextConfig = {
   },
 }
 
-export default nextConfig
+module.exports = nextConfig
 ```
 
 Evaluate if AMP is still necessary for your use case. Most performance benefits can now be achieved through Next.js's built-in optimizations and modern web standards.
diff --git a/docs/01-app/03-api-reference/01-directives/use-cache-private.mdx b/docs/01-app/03-api-reference/01-directives/use-cache-private.mdx
index 928eac58dc86..26a7ec16475a 100644
--- a/docs/01-app/03-api-reference/01-directives/use-cache-private.mdx
+++ b/docs/01-app/03-api-reference/01-directives/use-cache-private.mdx
@@ -44,7 +44,7 @@ const nextConfig = {
   cacheComponents: true,
 }
 
-export default nextConfig
+module.exports = nextConfig
 ```
 
 Then add `'use cache: private'` to your function along with a `cacheLife` configuration.
diff --git a/docs/01-app/03-api-reference/01-directives/use-cache-remote.mdx b/docs/01-app/03-api-reference/01-directives/use-cache-remote.mdx
index 21f10da3ddad..640bf39bc00c 100644
--- a/docs/01-app/03-api-reference/01-directives/use-cache-remote.mdx
+++ b/docs/01-app/03-api-reference/01-directives/use-cache-remote.mdx
@@ -44,7 +44,7 @@ const nextConfig = {
   cacheComponents: true,
 }
 
-export default nextConfig
+module.exports = nextConfig
 ```
 
 Then add `'use cache: remote'` to the functions or components where you've determined remote caching is justified. The handler implementation is configured via [`cacheHandlers`](/docs/app/api-reference/config/next-config-js/cacheHandlers), though hosting providers should typically provide this automatically. If you're self-hosting, see the `cacheHandlers` configuration reference to set up your cache storage.
diff --git a/docs/01-app/03-api-reference/01-directives/use-cache.mdx b/docs/01-app/03-api-reference/01-directives/use-cache.mdx
index e5084cc41930..75659409caf4 100644
--- a/docs/01-app/03-api-reference/01-directives/use-cache.mdx
+++ b/docs/01-app/03-api-reference/01-directives/use-cache.mdx
@@ -64,7 +64,8 @@ export async function MyComponent() {
 // Function level
 export async function getData() {
   'use cache'
-  const data = await fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  const data = await res.json()
   return data
 }
 ```
@@ -87,7 +88,10 @@ async function Component({ userId }: { userId: string }) {
   const getData = async (filter: string) => {
     'use cache'
     // Cache key includes both userId (from closure) and filter (argument)
-    return fetch(`/api/users/${userId}/data?filter=${filter}`)
+    const res = await fetch(
+      `https://api.example.com/users/${userId}/data?filter=${filter}`
+    )
+    return res.json()
   }
 
   return getData('active')
@@ -201,10 +205,10 @@ While `use cache` is designed primarily to include uncached data in the static s
 
 With the default in-memory handler, runtime cache behavior depends on your hosting environment:
 
-| Environment     | Runtime Caching Behavior                                                                                                                                          |
-| --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Serverless**  | Cache entries typically don't persist across requests (each request can be a different instance), or during revalidation. Build-time caching works normally.      |
-| **Self-hosted** | Cache entries persist across requests. Control cache size with [`cacheMaxMemorySize`](/docs/app/api-reference/config/next-config-js/incrementalCacheHandlerPath). |
+| Environment     | Runtime Caching Behavior                                                                                                                                     |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **Serverless**  | Cache entries typically don't persist across requests (each request can be a different instance), or during revalidation. Build-time caching works normally. |
+| **Self-hosted** | Cache entries persist across requests. Control cache size with [`cacheMaxMemorySize`](/docs/app/api-reference/config/next-config-js/cacheMaxMemorySize).     |
 
 For example, in a serverless environment, a cached function shared by two pages executes on each static shell revalidation, whereas in self-hosted or environments with persistent memory, the cached output is reused if it's still fresh.
 
@@ -296,7 +300,8 @@ import { cacheLife } from 'next/cache'
 async function getData() {
   'use cache'
   cacheLife('hours') // Use built-in 'hours' profile
-  return fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  return res.json()
 }
 ```
 
@@ -310,7 +315,8 @@ If you omit `cacheLife`, the `default` profile applies and the lifetime is no lo
 async function getData() {
   'use cache'
   // Implicitly uses the 'default' profile
-  return fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  return res.json()
 }
 ```
 
@@ -326,7 +332,8 @@ import { cacheTag } from 'next/cache'
 async function getProducts() {
   'use cache'
   cacheTag('products')
-  return fetch('/api/products')
+  const res = await fetch('https://api.example.com/products')
+  return res.json()
 }
 ```
 
@@ -371,7 +378,8 @@ Any components imported and nested in `page` file are part of the cache output a
 'use cache'
 
 async function Users() {
-  const users = await fetch('/api/users')
+  const res = await fetch('https://api.example.com/users')
+  const users = await res.json()
   // loop through users
 }
 
@@ -388,7 +396,8 @@ export default async function Page() {
 'use cache'
 
 async function Users() {
-  const users = await fetch('/api/users')
+  const res = await fetch('https://api.example.com/users')
+  const users = await res.json()
   // loop through users
 }
 
@@ -413,7 +422,10 @@ You can use `use cache` at the component level to cache any fetches or computati
 export async function Bookings({ type = 'haircut' }: BookingsProps) {
   'use cache'
   async function getBookingsData() {
-    const data = await fetch(`/api/bookings?type=${encodeURIComponent(type)}`)
+    const response = await fetch(
+      `https://api.example.com/bookings?type=${encodeURIComponent(type)}`
+    )
+    const data = await response.json()
     return data
   }
   return //...
@@ -428,7 +440,10 @@ interface BookingsProps {
 export async function Bookings({ type = 'haircut' }) {
   'use cache'
   async function getBookingsData() {
-    const data = await fetch(`/api/bookings?type=${encodeURIComponent(type)}`)
+    const response = await fetch(
+      `https://api.example.com/bookings?type=${encodeURIComponent(type)}`
+    )
+    const data = await response.json()
     return data
   }
   return //...
@@ -443,7 +458,8 @@ Since you can add `use cache` to any asynchronous function, you aren't limited t
 export async function getData() {
   'use cache'
 
-  const data = await fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  const data = await res.json()
   return data
 }
 ```
@@ -452,7 +468,8 @@ export async function getData() {
 export async function getData() {
   'use cache'
 
-  const data = await fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  const data = await res.json()
   return data
 }
 ```
@@ -485,7 +502,8 @@ async function CacheComponent({
   children: ReactNode
 }) {
   'use cache'
-  const cachedData = await fetch('/api/cached-data')
+  const res = await fetch('https://api.example.com/cached-data')
+  const cachedData = await res.json()
   return (
     <div>
       {header}
@@ -513,7 +531,8 @@ async function CacheComponent({
   children, // children: another slot for nested composition
 }) {
   'use cache'
-  const cachedData = await fetch('/api/cached-data')
+  const res = await fetch('https://api.example.com/cached-data')
+  const cachedData = await res.json()
   return (
     <div>
       {header}
diff --git a/docs/01-app/03-api-reference/02-components/image.mdx b/docs/01-app/03-api-reference/02-components/image.mdx
index d991234e6b4d..03680ec359be 100644
--- a/docs/01-app/03-api-reference/02-components/image.mdx
+++ b/docs/01-app/03-api-reference/02-components/image.mdx
@@ -239,7 +239,7 @@ An integer between `1` and `100` that sets the quality of the optimized image. H
 <Image quality={75} />
 ```
 
-If you’ve configured [qualities](#qualities) in `next.config.js`, the value must match one of the allowed entries.
+If you’ve configured [qualities](#qualities) in `next.config.js`, a value outside that list is coerced to the closest allowed entry. For example, with `qualities: [50, 75, 100]`, a `quality` of `80` is served as `75`. Development logs a warning so you can add the value to the allowlist.
 
 > **Good to know**: If the original image is already low quality, setting a high quality value will increase the file size without improving appearance.
 
@@ -1069,7 +1069,7 @@ export default function MyImage() {
 }
 ```
 
-When using `fill`, the parent element must have `position: relative` or `display: block`. This is necessary for the proper rendering of the image element in that layout mode.
+When using `fill`, the parent element must be positioned, with `position: relative`, `fixed`, or `absolute`. The image itself uses `position: absolute`, so it sizes against the nearest positioned ancestor.
 
 ```jsx
 <div style={{ position: 'relative' }}>
diff --git a/docs/01-app/03-api-reference/03-file-conventions/01-metadata/sitemap.mdx b/docs/01-app/03-api-reference/03-file-conventions/01-metadata/sitemap.mdx
index dc51591188a9..f195d6beea9a 100644
--- a/docs/01-app/03-api-reference/03-file-conventions/01-metadata/sitemap.mdx
+++ b/docs/01-app/03-api-reference/03-file-conventions/01-metadata/sitemap.mdx
@@ -389,7 +389,7 @@ export default async function sitemap(props) {
 }
 ```
 
-Your generated sitemaps will be available at `/.../sitemap/[id]`. For example, `/product/sitemap/1.xml`.
+Your generated sitemaps will be available at `/.../sitemap/[id].xml`. For example, `/product/sitemap/1.xml`.
 
 See the [`generateSitemaps` API reference](/docs/app/api-reference/functions/generate-sitemaps) for more information.
 
@@ -413,6 +413,8 @@ type Sitemap = Array<{
   alternates?: {
     languages?: Languages<string>
   }
+  images?: string[]
+  videos?: Videos[]
 }>
 ```
 
diff --git a/docs/01-app/03-api-reference/04-functions/cacheLife.mdx b/docs/01-app/03-api-reference/04-functions/cacheLife.mdx
index 83feeffebbb8..b04d33e7fe4a 100644
--- a/docs/01-app/03-api-reference/04-functions/cacheLife.mdx
+++ b/docs/01-app/03-api-reference/04-functions/cacheLife.mdx
@@ -34,7 +34,7 @@ const nextConfig = {
   cacheComponents: true,
 }
 
-export default nextConfig
+module.exports = nextConfig
 ```
 
 `cacheLife` can only be used within a cache directive scope.
diff --git a/docs/01-app/03-api-reference/04-functions/cacheTag.mdx b/docs/01-app/03-api-reference/04-functions/cacheTag.mdx
index c8691934e8c2..49f13e6f9f84 100644
--- a/docs/01-app/03-api-reference/04-functions/cacheTag.mdx
+++ b/docs/01-app/03-api-reference/04-functions/cacheTag.mdx
@@ -33,7 +33,7 @@ const nextConfig = {
   cacheComponents: true,
 }
 
-export default nextConfig
+module.exports = nextConfig
 ```
 
 The `cacheTag` function takes one or more string values.
@@ -44,7 +44,8 @@ import { cacheTag } from 'next/cache'
 export async function getData() {
   'use cache'
   cacheTag('my-data')
-  const data = await fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  const data = await res.json()
   return data
 }
 ```
@@ -55,7 +56,8 @@ import { cacheTag } from 'next/cache'
 export async function getData() {
   'use cache'
   cacheTag('my-data')
-  const data = await fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  const data = await res.json()
   return data
 }
 ```
@@ -118,7 +120,10 @@ export async function Bookings({ type = 'haircut' }: BookingsProps) {
   cacheTag('bookings-data')
 
   async function getBookingsData() {
-    const data = await fetch(`/api/bookings?type=${encodeURIComponent(type)}`)
+    const response = await fetch(
+      `https://api.example.com/bookings?type=${encodeURIComponent(type)}`
+    )
+    const data = await response.json()
     return data
   }
 
@@ -134,7 +139,10 @@ export async function Bookings({ type = 'haircut' }) {
   cacheTag('bookings-data')
 
   async function getBookingsData() {
-    const data = await fetch(`/api/bookings?type=${encodeURIComponent(type)}`)
+    const response = await fetch(
+      `https://api.example.com/bookings?type=${encodeURIComponent(type)}`
+    )
+    const data = await response.json()
     return data
   }
 
@@ -156,7 +164,10 @@ interface BookingsProps {
 export async function Bookings({ type = 'haircut' }: BookingsProps) {
   async function getBookingsData() {
     'use cache'
-    const data = await fetch(`/api/bookings?type=${encodeURIComponent(type)}`)
+    const response = await fetch(
+      `https://api.example.com/bookings?type=${encodeURIComponent(type)}`
+    )
+    const data = await response.json()
     cacheTag('bookings-data', data.id)
     return data
   }
@@ -170,7 +181,10 @@ import { cacheTag } from 'next/cache'
 export async function Bookings({ type = 'haircut' }) {
   async function getBookingsData() {
     'use cache'
-    const data = await fetch(`/api/bookings?type=${encodeURIComponent(type)}`)
+    const response = await fetch(
+      `https://api.example.com/bookings?type=${encodeURIComponent(type)}`
+    )
+    const data = await response.json()
     cacheTag('bookings-data', data.id)
     return data
   }
diff --git a/docs/01-app/03-api-reference/04-functions/fetch.mdx b/docs/01-app/03-api-reference/04-functions/fetch.mdx
index 2c6439cfe3ee..fbed6cf6f87c 100644
--- a/docs/01-app/03-api-reference/04-functions/fetch.mdx
+++ b/docs/01-app/03-api-reference/04-functions/fetch.mdx
@@ -98,7 +98,7 @@ fetch(url, { signal })
 
 ## Troubleshooting
 
-### Fetch default `auto no store` and `cache: 'no-store'` not showing fresh data in development
+### Fetch default `auto no cache` and `cache: 'no-store'` not showing fresh data in development
 
 Next.js caches `fetch` responses in Server Components across Hot Module Replacement (HMR) in local development for faster responses and to reduce costs for billed API calls.
 
diff --git a/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx b/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx
index 2585c0df6a6b..6eeebd8151a1 100644
--- a/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx
+++ b/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx
@@ -383,7 +383,6 @@ export const metadata = {
 <meta name="generator" content="Next.js" />
 <meta name="keywords" content="Next.js,React,JavaScript" />
 <meta name="referrer" content="origin-when-cross-origin" />
-<meta name="color-scheme" content="dark" />
 <meta name="creator" content="Jiachi Liu" />
 <meta name="publisher" content="Sebastian Markbåge" />
 <meta name="format-detection" content="telephone=no, address=no, email=no" />
@@ -1124,7 +1123,7 @@ The following metadata types do not currently have built-in support. However, th
 | `<style>`                     | Learn more about [styling in Next.js](/docs/app/getting-started/css).                                                                                                                                                                        |
 | `<script>`                    | Learn more about [using scripts](/docs/app/guides/scripts).                                                                                                                                                                                  |
 | `<link rel="stylesheet" />`   | `import` stylesheets directly in the layout or page itself.                                                                                                                                                                                  |
-| `<link rel="preload />`       | Use [ReactDOM preload method](#link-relpreload)                                                                                                                                                                                              |
+| `<link rel="preload" />`      | Use [ReactDOM preload method](#link-relpreload)                                                                                                                                                                                              |
 | `<link rel="preconnect" />`   | Use [ReactDOM preconnect method](#link-relpreconnect)                                                                                                                                                                                        |
 | `<link rel="dns-prefetch" />` | Use [ReactDOM prefetchDNS method](#link-reldns-prefetch)                                                                                                                                                                                     |
 
@@ -1422,5 +1421,5 @@ export const metadata = {
 | Version   | Changes                                                                                                                                                 |
 | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `v15.2.0` | Introduced streaming support to `generateMetadata`.                                                                                                     |
-| `v13.2.0` | `viewport`, `themeColor`, and `colorScheme` deprecated in favor of the [`viewport` configuration](/docs/app/api-reference/functions/generate-viewport). |
+| `v14.0.0` | `viewport`, `themeColor`, and `colorScheme` deprecated in favor of the [`viewport` configuration](/docs/app/api-reference/functions/generate-viewport). |
 | `v13.2.0` | `metadata` and `generateMetadata` introduced.                                                                                                           |
diff --git a/docs/01-app/03-api-reference/04-functions/updateTag.mdx b/docs/01-app/03-api-reference/04-functions/updateTag.mdx
index 16af34359e85..2726d57dadc1 100644
--- a/docs/01-app/03-api-reference/04-functions/updateTag.mdx
+++ b/docs/01-app/03-api-reference/04-functions/updateTag.mdx
@@ -121,7 +121,7 @@ export async function createPost(formData) {
 ### Error when used outside Server Actions
 
 ```ts filename="app/api/posts/route.ts" switcher
-import { updateTag } from 'next/cache'
+import { revalidateTag, updateTag } from 'next/cache'
 
 export async function POST() {
   // This will throw an error
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheHandlers.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheHandlers.mdx
index 1cbb56682d2d..1673c5297563 100644
--- a/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheHandlers.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheHandlers.mdx
@@ -471,7 +471,7 @@ For a full explanation of the tag architecture (including soft tags and multi-in
 
 ## Soft Tags
 
-Soft tags are implicit tags that Next.js automatically generates based on the route path. For example, the route `/blog/hello` generates soft tags for `/`, `/blog`, `/blog/hello`, and their corresponding layout entries. These tags are prefixed internally with `_N_T_`.
+Soft tags are implicit tags that Next.js automatically generates based on the route path. Every segment in the path gets a layout tag, plus the leaf route itself. For example, the route `/blog/hello` generates soft tags for `/layout`, `/blog/layout`, `/blog/hello/layout`, and `/blog/hello`. These tags are prefixed internally with `_N_T_`.
 
 Soft tags enable [`revalidatePath()`](/docs/app/api-reference/functions/revalidatePath) to work through the same tag-based cache system. When `revalidatePath('/blog/hello')` is called, it invalidates all cache entries associated with that path's soft tags.
 
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheLife.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheLife.mdx
index 08915e1699c9..b5f5f99400fe 100644
--- a/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheLife.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheLife.mdx
@@ -54,7 +54,8 @@ import { cacheLife } from 'next/cache'
 export async function getCachedData() {
   'use cache'
   cacheLife('blog')
-  const data = await fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  const data = await res.json()
   return data
 }
 ```
@@ -65,7 +66,8 @@ import { cacheLife } from 'next/cache'
 export async function getCachedData() {
   'use cache'
   cacheLife('blog')
-  const data = await fetch('/api/data')
+  const res = await fetch('https://api.example.com/data')
+  const data = await res.json()
   return data
 }
 ```
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheMaxMemorySize.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheMaxMemorySize.mdx
new file mode 100644
index 000000000000..727cd8255502
--- /dev/null
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheMaxMemorySize.mdx
@@ -0,0 +1,36 @@
+---
+title: cacheMaxMemorySize
+description: Configure the size of the in-memory cache that Next.js keeps in each server instance.
+---
+
+{/* The content of this doc is shared between the app and pages router. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
+
+`cacheMaxMemorySize` sets the size, in bytes, of the in-memory cache each Next.js server instance keeps. It defaults to 50 MB.
+
+```ts filename="next.config.ts" switcher
+import type { NextConfig } from 'next'
+
+const nextConfig: NextConfig = {
+  cacheMaxMemorySize: 50 * 1024 * 1024, // 50 MB, the default
+}
+
+export default nextConfig
+```
+
+```js filename="next.config.js" switcher
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  cacheMaxMemorySize: 50 * 1024 * 1024, // 50 MB, the default
+}
+
+module.exports = nextConfig
+```
+
+The option sizes two separate caches:
+
+- The server cache that stores prerendered pages, route handler responses, and optimized images. Set this to `0` when adopting a [custom `cacheHandler`](/docs/app/api-reference/config/next-config-js/incrementalCacheHandlerPath), so reads go to your store rather than a per-instance copy.
+- The built-in handler behind [`'use cache'`](/docs/app/api-reference/directives/use-cache). If you register your own handler through [`cacheHandlers`](/docs/app/api-reference/config/next-config-js/cacheHandlers), that handler manages its own memory and this option no longer applies to it.
+
+Setting `cacheMaxMemorySize: 0` disables both in-memory caches. It is also a way to mimic how `use cache` behaves in a serverless environment, where entries rarely survive between requests.
+
+> **Good to know**: `next dev` keeps its own in-memory cache regardless of this option, so reloads stay fast. Production honors the configured value exactly.
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/images.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/images.mdx
index a04e9db02cc9..13940c8ad3d9 100644
--- a/docs/01-app/03-api-reference/05-config/01-next-config-js/images.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/images.mdx
@@ -156,8 +156,8 @@ export default function gumletLoader({ src, width, quality }) {
 // Docs: https://support.imageengine.io/hc/en-us/articles/360058880672-Directives
 export default function imageengineLoader({ src, width, quality }) {
   const compression = 100 - (quality || 50)
-  const params = [`w_${width}`, `cmpr_${compression}`)]
-  return `https://example.com${src}?imgeng=/${params.join('/')`
+  const params = [`w_${width}`, `cmpr_${compression}`]
+  return `https://example.com${src}?imgeng=/${params.join('/')}`
 }
 ```
 
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/incrementalCacheHandlerPath.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/incrementalCacheHandlerPath.mdx
index 9511a5f9799d..4c6f8e020c85 100644
--- a/docs/01-app/03-api-reference/05-config/01-next-config-js/incrementalCacheHandlerPath.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/incrementalCacheHandlerPath.mdx
@@ -6,7 +6,7 @@ description: Configure the Next.js cache used for storing and revalidating data
 
 You can configure the Next.js cache location if you want to persist cached pages and data to durable storage, or share the cache across multiple containers or instances of your Next.js application.
 
-> **Good to know**: The `cacheHandler` (singular) configuration is specifically used by Next.js for server cache operations such as storing and revalidating ISR, route handler responses, and optimized images. It is **not** used by `'use cache'` directives. For `'use cache'` directives, use [`cacheHandlers`](/docs/app/api-reference/config/next-config-js/cacheHandlers) (plural) instead.
+> **Good to know**: The `cacheHandler` (singular) configuration is specifically used by Next.js for server cache operations such as storing and revalidating ISR, route handler responses, and optimized images. It is **not** used by `'use cache'` directives. For `'use cache'` directives, use [`cacheHandlers`](/docs/app/api-reference/config/next-config-js/cacheHandlers) (plural) instead. [`cacheMaxMemorySize`](/docs/app/api-reference/config/next-config-js/cacheMaxMemorySize) is separate from both, and sizes the in-memory cache for each.
 
 ```js filename="next.config.js"
 module.exports = {
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/staticGeneration.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/staticGeneration.mdx
index e194fd7e38a8..a1ac57d6b0f4 100644
--- a/docs/01-app/03-api-reference/05-config/01-next-config-js/staticGeneration.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/staticGeneration.mdx
@@ -29,7 +29,7 @@ const nextConfig = {
   },
 }
 
-export default nextConfig
+module.exports = nextConfig
 ```
 
 ## Config Options
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/taint.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/taint.mdx
index 265639cc4cf1..130e62dd728b 100644
--- a/docs/01-app/03-api-reference/05-config/01-next-config-js/taint.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/taint.mdx
@@ -63,7 +63,7 @@ In this case, the `getUserDetails` function returns data about a given user. We
 ```ts switcher
 import { experimental_taintObjectReference } from 'react'
 
-function getUserDetails(id: string): UserDetails {
+async function getUserDetails(id: string): Promise<UserDetails> {
   const user = await db.queryUserById(id)
 
   experimental_taintObjectReference(
@@ -78,7 +78,7 @@ function getUserDetails(id: string): UserDetails {
 ```js switcher
 import { experimental_taintObjectReference } from 'react'
 
-function getUserDetails(id) {
+async function getUserDetails(id) {
   const user = await db.queryUserById(id)
 
   experimental_taintObjectReference(
@@ -151,15 +151,15 @@ export async function ContactPage({ params }) {
 
 ### Tainting a unique value
 
-In this case, we can access the server configuration by awaiting calls to `config.getConfigDetails`. However, the system configuration contains the `SERVICE_API_KEY` that we don't want to expose to clients.
+In this case, we can access the server configuration by awaiting calls to `configService.getConfigDetails`. However, the system configuration contains the `SERVICE_API_KEY` that we don't want to expose to clients.
 
 We can taint the `config.SERVICE_API_KEY` value.
 
 ```ts switcher
 import { experimental_taintUniqueValue } from 'react'
 
-function getSystemConfig(): SystemConfig {
-  const config = await config.getConfigDetails()
+async function getSystemConfig(): Promise<SystemConfig> {
+  const config = await configService.getConfigDetails()
 
   experimental_taintUniqueValue(
     'Do not pass configuration tokens to the client',
@@ -174,8 +174,8 @@ function getSystemConfig(): SystemConfig {
 ```js switcher
 import { experimental_taintUniqueValue } from 'react'
 
-function getSystemConfig() {
-  const config = await config.getConfigDetails()
+async function getSystemConfig() {
+  const config = await configService.getConfigDetails()
 
   experimental_taintUniqueValue(
     'Do not pass configuration tokens to the client',
diff --git a/docs/01-app/03-api-reference/05-config/01-next-config-js/turbopack.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/turbopack.mdx
index 0c0b2cb260f7..a5455c2f30ad 100644
--- a/docs/01-app/03-api-reference/05-config/01-next-config-js/turbopack.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/turbopack.mdx
@@ -7,7 +7,7 @@ description: Configure Next.js with Turbopack-specific options
 
 The `turbopack` option lets you customize [Turbopack](/docs/app/api-reference/turbopack) to transform different files and change how modules are resolved.
 
-> **Good to know**: The `turbopack` option was previously named `experimental.turbo` in Next.js versions 13.0.0 to 15.2.x. The `experimental.turbo` option will be removed in Next.js 16.
+> **Good to know**: The `turbopack` option was previously named `experimental.turbo` in Next.js versions 13.0.0 to 15.2.x, an option which still works as an alias, but new configuration should use the top-level `turbopack` option.
 >
 > If you are using an older version of Next.js, run `npx @next/codemod@latest next-experimental-turbo-to-turbopack .` to automatically migrate your configuration.
 
diff --git a/docs/01-app/03-api-reference/06-cli/next.mdx b/docs/01-app/03-api-reference/06-cli/next.mdx
index c93cea66c164..8e33d828ea47 100644
--- a/docs/01-app/03-api-reference/06-cli/next.mdx
+++ b/docs/01-app/03-api-reference/06-cli/next.mdx
@@ -93,22 +93,20 @@ See the [Building guide](/docs/app/guides/building) to learn how to read the out
 
 The following options are available for the `next build` command:
 
-| Option                             | Description                                                                                                                                                                        |
-| ---------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `-h, --help`                       | Show all available options.                                                                                                                                                        |
-| `[directory]`                      | A directory on which to build the application. If not provided, the current directory will be used.                                                                                |
-| `--turbopack`                      | Force enable [Turbopack](/docs/app/api-reference/turbopack) (enabled by default). Also available as `--turbo`.                                                                     |
-| `--webpack`                        | Build using Webpack.                                                                                                                                                               |
-| `-d` or `--debug`                  | Enables a more verbose build output. With this flag enabled additional build output like rewrites, redirects, and headers will be shown.                                           |
-|                                    |
-| `--profile`                        | Enables production [profiling for React](https://react.dev/reference/react/Profiler).                                                                                              |
-| `--no-lint`                        | Disables linting. _Note: linting will be removed from `next build` in Next 16. If you're using Next 15.5+ with a linter other than `eslint`, linting during build will not occur._ |
-| `--no-mangling`                    | Disables [mangling](https://en.wikipedia.org/wiki/Name_mangling). This may affect performance and should only be used for debugging purposes.                                      |
-| `--experimental-app-only`          | Builds only App Router routes.                                                                                                                                                     |
-| `--experimental-build-mode [mode]` | Uses an experimental build mode. (choices: "compile", "generate", default: "default")                                                                                              |
-| `--debug-prerender`                | Debug prerender errors in development.                                                                                                                                             |
-| `--debug-build-paths=<patterns>`   | Build only specific routes for debugging.                                                                                                                                          |
-| `--experimental-cpu-prof`          | Enables CPU profiling using V8's inspector. Profiles are saved to `.next-profiles/` on exit.                                                                                       |
+| Option                             | Description                                                                                                                                   |
+| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
+| `-h, --help`                       | Show all available options.                                                                                                                   |
+| `[directory]`                      | A directory on which to build the application. If not provided, the current directory will be used.                                           |
+| `--turbopack`                      | Force enable [Turbopack](/docs/app/api-reference/turbopack) (enabled by default). Also available as `--turbo`.                                |
+| `--webpack`                        | Build using Webpack.                                                                                                                          |
+| `-d` or `--debug`                  | Enables a more verbose build output. With this flag enabled additional build output like rewrites, redirects, and headers will be shown.      |
+| `--profile`                        | Enables production [profiling for React](https://react.dev/reference/react/Profiler).                                                         |
+| `--no-mangling`                    | Disables [mangling](https://en.wikipedia.org/wiki/Name_mangling). This may affect performance and should only be used for debugging purposes. |
+| `--experimental-app-only`          | Builds only App Router routes.                                                                                                                |
+| `--experimental-build-mode [mode]` | Uses an experimental build mode. (choices: "compile", "generate", default: "default")                                                         |
+| `--debug-prerender`                | Debug prerender errors in development.                                                                                                        |
+| `--debug-build-paths=<patterns>`   | Build only specific routes for debugging.                                                                                                     |
+| `--experimental-cpu-prof`          | Enables CPU profiling using V8's inspector. Profiles are saved to `.next-profiles/` on exit.                                                  |
 
 ### `next start` options
 
diff --git a/lerna.json b/lerna.json
index 44feb68eff1b..e09d41f80fa6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -15,5 +15,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "16.3.1-canary.22"
+  "version": "16.3.1-canary.23"
 }
\ No newline at end of file
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 2320a08e26d1..327d14118d19 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "keywords": [
     "react",
     "next",
diff --git a/packages/devlow-bench/package.json b/packages/devlow-bench/package.json
index 428dfcde34c9..fed4a057cc93 100644
--- a/packages/devlow-bench/package.json
+++ b/packages/devlow-bench/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vercel/devlow-bench",
   "private": true,
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "Benchmarking tool for the developer workflow",
   "repository": {
     "type": "git",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index bf05e0a9a3fe..24ef5919c477 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "ESLint configuration used by Next.js.",
   "license": "MIT",
   "repository": {
@@ -12,7 +12,7 @@
     "dist"
   ],
   "dependencies": {
-    "@next/eslint-plugin-next": "16.3.1-canary.22",
+    "@next/eslint-plugin-next": "16.3.1-canary.23",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^3.5.2",
     "eslint-plugin-import": "^2.32.0",
diff --git a/packages/eslint-plugin-internal/package.json b/packages/eslint-plugin-internal/package.json
index a42494432ae4..c7c67cb1fe3a 100644
--- a/packages/eslint-plugin-internal/package.json
+++ b/packages/eslint-plugin-internal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/eslint-plugin-internal",
   "private": true,
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "ESLint plugin for working on Next.js.",
   "exports": {
     ".": "./src/eslint-plugin-internal.js"
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index 0eae02502ede..5a6837ea0c94 100644
--- a/packages/eslint-plugin-next/package.json
+++ b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/font/package.json b/packages/font/package.json
index 7f47568b4779..cbb994b7d2d0 100644
--- a/packages/font/package.json
+++ b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 1f0c936f6993..1dc42e416810 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 27876c3ff45b..3656ee61be7e 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index 054180471d46..955448078f9d 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index 21dc8c17a313..97513eb23987 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-playwright/package.json b/packages/next-playwright/package.json
index e5877017dc1c..2d76a3617656 100644
--- a/packages/next-playwright/package.json
+++ b/packages/next-playwright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/playwright",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-playwright"
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index c2d1c08ca52f..8db48e9bd0cf 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
index f046d3be7d4b..f31f28bc1206 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",
diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
index 6fbbad4d5fde..32031cc3a355 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next-routing/package.json b/packages/next-routing/package.json
index d8898357c312..b5dea8319a57 100644
--- a/packages/next-routing/package.json
+++ b/packages/next-routing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/routing",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-rspack/package.json b/packages/next-rspack/package.json
index 8763186ec641..a85695747375 100644
--- a/packages/next-rspack/package.json
+++ b/packages/next-rspack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-rspack",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-rspack"
diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
index f7742cdb27bb..d12f378f521b 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "private": true,
   "files": [
     "native/"
diff --git a/packages/next/package.json b/packages/next/package.json
index b7a7fc330063..ec4013ff932c 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -100,7 +100,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "16.3.1-canary.22",
+    "@next/env": "16.3.1-canary.23",
     "@swc/helpers": "0.5.23",
     "baseline-browser-mapping": "^2.9.19",
     "caniuse-lite": "^1.0.30001579",
@@ -164,11 +164,11 @@
     "@modelcontextprotocol/sdk": "1.18.1",
     "@mswjs/interceptors": "0.42.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "16.3.1-canary.22",
-    "@next/polyfill-module": "16.3.1-canary.22",
-    "@next/polyfill-nomodule": "16.3.1-canary.22",
-    "@next/react-refresh-utils": "16.3.1-canary.22",
-    "@next/swc": "16.3.1-canary.22",
+    "@next/font": "16.3.1-canary.23",
+    "@next/polyfill-module": "16.3.1-canary.23",
+    "@next/polyfill-nomodule": "16.3.1-canary.23",
+    "@next/react-refresh-utils": "16.3.1-canary.23",
+    "@next/swc": "16.3.1-canary.23",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.61.0",
     "@rspack/core": "1.6.7",
diff --git a/packages/next/src/server/lib/trace/constants.ts b/packages/next/src/server/lib/trace/constants.ts
index 5b5d8b6099df..679e7d6d4fc7 100644
--- a/packages/next/src/server/lib/trace/constants.ts
+++ b/packages/next/src/server/lib/trace/constants.ts
@@ -116,6 +116,10 @@ enum AppRouteRouteHandlersSpan {
   runHandler = 'AppRouteRouteHandlers.runHandler',
 }
 
+enum AppRouteRouteModuleSpan {
+  loadUserland = 'AppRouteRouteModule.loadUserland',
+}
+
 enum RouteModuleSpan {
   prepare = 'RouteModule.prepare',
   loadManifests = 'RouteModule.loadManifests',
@@ -142,6 +146,7 @@ type SpanTypes =
   | `${DevBundlerServiceSpan}`
   | `${NodeSpan}`
   | `${AppRouteRouteHandlersSpan}`
+  | `${AppRouteRouteModuleSpan}`
   | `${RouteModuleSpan}`
   | `${ResolveMetadataSpan}`
   | `${MiddlewareSpan}`
@@ -158,6 +163,7 @@ export const NextVanillaSpanAllowlist = new Set([
   RenderSpan.renderDocument,
   NodeSpan.runHandler,
   AppRouteRouteHandlersSpan.runHandler,
+  AppRouteRouteModuleSpan.loadUserland,
   RouteModuleSpan.prepare,
   InstrumentationSpan.loadModule,
   InstrumentationSpan.register,
@@ -191,6 +197,7 @@ export {
   DevBundlerServiceSpan,
   NodeSpan,
   AppRouteRouteHandlersSpan,
+  AppRouteRouteModuleSpan,
   RouteModuleSpan,
   ResolveMetadataSpan,
   MiddlewareSpan,
diff --git a/packages/next/src/server/lib/trace/tracer.test.ts b/packages/next/src/server/lib/trace/tracer.test.ts
index 21d5d485b464..8df7b11881d5 100644
--- a/packages/next/src/server/lib/trace/tracer.test.ts
+++ b/packages/next/src/server/lib/trace/tracer.test.ts
@@ -24,6 +24,7 @@ import {
   traceLocalSpan,
 } from './local-span-recorder'
 import {
+  AppRouteRouteModuleSpan,
   AppRenderSpan,
   BaseServerSpan,
   InstrumentationSpan,
@@ -268,6 +269,7 @@ describe('local span recording', () => {
     ])
 
     getTracer().trace(RouteModuleSpan.prepare, () => undefined)
+    getTracer().trace(AppRouteRouteModuleSpan.loadUserland, () => undefined)
     getTracer().trace(RouteModuleSpan.loadManifests, () => undefined)
     getTracer().trace(InstrumentationSpan.register, () => undefined)
     getTracer().trace(InstrumentationSpan.loadModule, () => undefined)
@@ -275,6 +277,7 @@ describe('local span recording', () => {
       NodeSpan.runHandler,
       LoadComponentsSpan.loadRouteModule,
       RouteModuleSpan.prepare,
+      AppRouteRouteModuleSpan.loadUserland,
       InstrumentationSpan.register,
       InstrumentationSpan.loadModule,
     ])
@@ -287,6 +290,7 @@ describe('local span recording', () => {
       NodeSpan.runHandler,
       LoadComponentsSpan.loadRouteModule,
       RouteModuleSpan.prepare,
+      AppRouteRouteModuleSpan.loadUserland,
       InstrumentationSpan.register,
       InstrumentationSpan.loadModule,
       BaseServerSpan.render,
diff --git a/packages/next/src/server/route-modules/app-route/module.ts b/packages/next/src/server/route-modules/app-route/module.ts
index 40dd4423ebee..243406d5b762 100644
--- a/packages/next/src/server/route-modules/app-route/module.ts
+++ b/packages/next/src/server/route-modules/app-route/module.ts
@@ -22,7 +22,10 @@ import { type HTTP_METHOD, HTTP_METHODS, isHTTPMethod } from '../../web/http'
 import { getImplicitTags, type ImplicitTags } from '../../lib/implicit-tags'
 import { patchFetch } from '../../lib/patch-fetch'
 import { getTracer } from '../../lib/trace/tracer'
-import { AppRouteRouteHandlersSpan } from '../../lib/trace/constants'
+import {
+  AppRouteRouteHandlersSpan,
+  AppRouteRouteModuleSpan,
+} from '../../lib/trace/constants'
 import * as Log from '../../../build/output/log'
 import { autoImplementMethods } from './helpers/auto-implement-methods'
 import {
@@ -281,8 +284,19 @@ export class AppRouteRouteModule extends RouteModule<
     this.resolvedPagePath = resolvedPagePath
     this.nextConfigOutput = nextConfigOutput
     this._getUserland = getUserland
-    this._lazyUserland = new LazyModule(userland, (module) =>
-      this._onUserlandLoaded(module)
+    this._lazyUserland = new LazyModule(
+      () =>
+        getTracer().trace(
+          AppRouteRouteModuleSpan.loadUserland,
+          {
+            spanName: 'load app route module',
+            attributes: {
+              'next.route': this.definition.pathname,
+            },
+          },
+          userland
+        ),
+      (module) => this._onUserlandLoaded(module)
     )
 
     // output:export routes load eagerly, so that errors surface at module
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
index 79e3ba6ed56f..c07c6a9e857a 100644
--- a/packages/react-refresh-utils/package.json
+++ b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json
index cb74a82d8119..95b1a958da05 100644
--- a/packages/third-parties/package.json
+++ b/packages/third-parties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "16.3.1-canary.22",
+  "version": "16.3.1-canary.23",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "16.3.1-canary.22",
+    "next": "16.3.1-canary.23",
     "outdent": "0.8.0",
     "prettier": "2.5.1",
     "typescript": "6.0.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0de35af98076..acc28398c22c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1024,7 +1024,7 @@ importers:
   packages/eslint-config-next:
     dependencies:
       '@next/eslint-plugin-next':
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../eslint-plugin-next
       eslint:
         specifier: '>=9.0.0'
@@ -1107,7 +1107,7 @@ importers:
   packages/next:
     dependencies:
       '@next/env':
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../next-env
       '@swc/helpers':
         specifier: 0.5.23
@@ -1228,19 +1228,19 @@ importers:
         specifier: 1.2.0
         version: 1.2.0
       '@next/font':
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../font
       '@next/polyfill-module':
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../next-polyfill-module
       '@next/polyfill-nomodule':
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../next-polyfill-nomodule
       '@next/react-refresh-utils':
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../react-refresh-utils
       '@next/swc':
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../next-swc
       '@opentelemetry/api':
         specifier: 1.6.0
@@ -1983,7 +1983,7 @@ importers:
         version: 1.0.20
     devDependencies:
       next:
-        specifier: 16.3.1-canary.22
+        specifier: 16.3.1-canary.23
         version: link:../next
       outdent:
         specifier: 0.8.0
diff --git a/test/e2e/i18n-basepath-fallback-false-404/i18n-basepath-fallback-false-404.test.ts b/test/e2e/i18n-basepath-fallback-false-404/i18n-basepath-fallback-false-404.test.ts
new file mode 100644
index 000000000000..535940ec4035
--- /dev/null
+++ b/test/e2e/i18n-basepath-fallback-false-404/i18n-basepath-fallback-false-404.test.ts
@@ -0,0 +1,17 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('i18n-basepath-fallback-false-404', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it.each([
+    ['/docs/api/blog/first', { slug: 'first' }],
+    ['/docs/api/catchall/hello/world', { rest: ['hello', 'world'] }],
+  ])('should resolve the dynamic API route %s', async (pathname, expected) => {
+    const res = await next.fetch(pathname)
+
+    expect(res.status).toBe(200)
+    expect(await res.json()).toEqual(expected)
+  })
+})
diff --git a/test/e2e/i18n-basepath-fallback-false-404/next.config.js b/test/e2e/i18n-basepath-fallback-false-404/next.config.js
new file mode 100644
index 000000000000..c4943b7551b4
--- /dev/null
+++ b/test/e2e/i18n-basepath-fallback-false-404/next.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  basePath: '/docs',
+  i18n: {
+    locales: ['en', 'fr'],
+    defaultLocale: 'en',
+  },
+}
diff --git a/test/e2e/i18n-basepath-fallback-false-404/pages/404.tsx b/test/e2e/i18n-basepath-fallback-false-404/pages/404.tsx
new file mode 100644
index 000000000000..a5a63a6a09ea
--- /dev/null
+++ b/test/e2e/i18n-basepath-fallback-false-404/pages/404.tsx
@@ -0,0 +1,3 @@
+export default function NotFound() {
+  return 'not found page'
+}
diff --git a/test/e2e/i18n-basepath-fallback-false-404/pages/api/blog/[slug].ts b/test/e2e/i18n-basepath-fallback-false-404/pages/api/blog/[slug].ts
new file mode 100644
index 000000000000..191d77ca51ce
--- /dev/null
+++ b/test/e2e/i18n-basepath-fallback-false-404/pages/api/blog/[slug].ts
@@ -0,0 +1,5 @@
+import type { NextApiRequest, NextApiResponse } from 'next'
+
+export default function handler(req: NextApiRequest, res: NextApiResponse) {
+  res.json({ slug: req.query.slug })
+}
diff --git a/test/e2e/i18n-basepath-fallback-false-404/pages/api/catchall/[...rest].ts b/test/e2e/i18n-basepath-fallback-false-404/pages/api/catchall/[...rest].ts
new file mode 100644
index 000000000000..119d4f4f0847
--- /dev/null
+++ b/test/e2e/i18n-basepath-fallback-false-404/pages/api/catchall/[...rest].ts
@@ -0,0 +1,5 @@
+import type { NextApiRequest, NextApiResponse } from 'next'
+
+export default function handler(req: NextApiRequest, res: NextApiResponse) {
+  res.json({ rest: req.query.rest })
+}
diff --git a/test/e2e/i18n-basepath-fallback-false-404/pages/foo/[slug].tsx b/test/e2e/i18n-basepath-fallback-false-404/pages/foo/[slug].tsx
new file mode 100644
index 000000000000..603b29eb3d5c
--- /dev/null
+++ b/test/e2e/i18n-basepath-fallback-false-404/pages/foo/[slug].tsx
@@ -0,0 +1,14 @@
+export default function Page() {
+  return 'dynamic page'
+}
+
+export function getStaticProps() {
+  return { props: {} }
+}
+
+export function getStaticPaths() {
+  return {
+    paths: [{ params: { slug: 'first' } }],
+    fallback: false,
+  }
+}
diff --git a/test/e2e/i18n-basepath-fallback-false-404/pages/index.tsx b/test/e2e/i18n-basepath-fallback-false-404/pages/index.tsx
new file mode 100644
index 000000000000..ff7159d9149f
--- /dev/null
+++ b/test/e2e/i18n-basepath-fallback-false-404/pages/index.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>hello world</p>
+}
diff --git a/test/e2e/opentelemetry/instrumentation/app/api/app/[param]/data/route.ts b/test/e2e/opentelemetry/instrumentation/app/api/app/[param]/data/route.ts
index f2b89ee775de..812a3872fd9c 100644
--- a/test/e2e/opentelemetry/instrumentation/app/api/app/[param]/data/route.ts
+++ b/test/e2e/opentelemetry/instrumentation/app/api/app/[param]/data/route.ts
@@ -1,3 +1,6 @@
+// Keep this module asynchronous so tracing covers promise-backed userland loads.
+await Promise.resolve()
+
 export async function GET() {
   return new Response(JSON.stringify({ test: 'data' }))
 }
diff --git a/test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts b/test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts
index 3b6af409337f..4ab9140e54c8 100644
--- a/test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts
+++ b/test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts
@@ -14,6 +14,7 @@ const EXTERNAL = {
 const COLLECTOR_PORT = 9001
 const ROUTE_PREPARATION_COLLECTOR_PORT = 9002
 const INSTRUMENTATION_STARTUP_COLLECTOR_PORT = 9003
+const APP_ROUTE_MODULE_LOADING_COLLECTOR_PORT = 9004
 
 function setup({ useDirectEntrypointHandler, useNodeMiddleware }) {
   let collector: Collector
@@ -1600,6 +1601,139 @@ if (isNextStart) {
   })
 }
 
+describe.each(
+  [
+    { name: 'default', useDirectEntrypointHandler: false },
+    isNextStart && {
+      name: 'direct entrypoints',
+      useDirectEntrypointHandler: true,
+    },
+  ].filter(Boolean)
+)(
+  'opentelemetry App Route module loading - $name',
+  ({ useDirectEntrypointHandler }) => {
+    let collector: Collector | undefined
+    const { next, skipped } = nextTestSetup({
+      files: __dirname,
+      skipDeployment: true,
+      skipStart: true,
+      dependencies: require('./package.json').dependencies,
+      ...(!useDirectEntrypointHandler
+        ? {
+            env: {
+              TEST_OTEL_COLLECTOR_PORT: String(
+                APP_ROUTE_MODULE_LOADING_COLLECTOR_PORT
+              ),
+              NEXT_TELEMETRY_DISABLED: '1',
+            },
+          }
+        : {
+            startCommand: 'pnpm start-entrypoint',
+            packageJson: {
+              scripts: {
+                'start-entrypoint':
+                  'pnpm tsx custom-entrypoint-server.ts --without-parent-span',
+              },
+            },
+            serverReadyPattern: /- Local:/,
+            env: {
+              TEST_OTEL_COLLECTOR_PORT: String(
+                APP_ROUTE_MODULE_LOADING_COLLECTOR_PORT
+              ),
+              NEXT_TELEMETRY_DISABLED: '1',
+              NODE_ENV: 'production',
+            },
+          }),
+    })
+
+    if (skipped) {
+      return
+    }
+
+    afterAll(async () => {
+      await collector?.shutdown()
+    })
+
+    it('should trace cold App Route module loading once', async () => {
+      collector = await connectCollector({
+        port: APP_ROUTE_MODULE_LOADING_COLLECTOR_PORT,
+      })
+      await next.start()
+
+      const pathname = '/api/app/param/data'
+      const route = '/api/app/[param]/data'
+      expect((await next.fetch(pathname)).status).toBe(200)
+
+      let coldSpanId: string | undefined
+      await retry(async () => {
+        const spans = collector?.getSpans() ?? []
+        const rootSpan = spans.find(
+          (span) =>
+            span.attributes?.['next.span_type'] ===
+              'BaseServer.handleRequest' &&
+            span.attributes?.['http.target'] === pathname
+        )
+        const moduleLoadSpans = spans.filter(
+          (span) =>
+            span.attributes?.['next.span_type'] ===
+              'AppRouteRouteModule.loadUserland' &&
+            span.attributes?.['next.route'] === route
+        )
+
+        expect(rootSpan).toBeDefined()
+        expect(moduleLoadSpans).toEqual([
+          expect.objectContaining({
+            runtime: 'nodejs',
+            name: 'load app route module',
+            traceId: rootSpan?.traceId,
+            attributes: {
+              'next.route': route,
+              'next.span_category': 'nextjs',
+              'next.span_name': 'load app route module',
+              'next.span_type': 'AppRouteRouteModule.loadUserland',
+            },
+            status: { code: 0 },
+          }),
+        ])
+
+        const moduleLoadSpan = moduleLoadSpans[0]
+        const ancestorIds = new Set<string>()
+        const parentBySpanId = new Map(
+          spans.map((span) => [span.id, span.parentId])
+        )
+        let parentId = moduleLoadSpan.parentId
+        while (parentId) {
+          ancestorIds.add(parentId)
+          parentId = parentBySpanId.get(parentId)
+        }
+        expect(ancestorIds).toContain(rootSpan?.id)
+        coldSpanId = moduleLoadSpan.id
+      })
+
+      expect((await next.fetch(pathname)).status).toBe(200)
+      await retry(async () => {
+        const spans = collector?.getSpans() ?? []
+        expect(
+          spans.filter(
+            (span) =>
+              span.attributes?.['next.span_type'] ===
+                'AppRouteRouteModule.loadUserland' &&
+              span.attributes?.['next.route'] === route
+          )
+        ).toEqual([expect.objectContaining({ id: coldSpanId })])
+        expect(
+          spans.filter(
+            (span) =>
+              span.attributes?.['next.span_type'] ===
+                'BaseServer.handleRequest' &&
+              span.attributes?.['http.target'] === pathname
+          )
+        ).toHaveLength(2)
+      })
+    })
+  }
+)
+
 describe.each(
   [
     { name: 'default', useDirectEntrypointHandler: false },
@@ -2284,6 +2418,7 @@ async function expectTrace(
         (span) =>
           ![
             'LoadComponents.loadRouteModule',
+            'AppRouteRouteModule.loadUserland',
             'RouteModule.prepare',
             'Instrumentation.loadModule',
             'Instrumentation.register',
diff --git a/test/production/next-image-legacy/basic/basic.test.ts b/test/production/next-image-legacy/basic/basic.test.ts
index ed79ae676f26..869ff2354c5a 100644
--- a/test/production/next-image-legacy/basic/basic.test.ts
+++ b/test/production/next-image-legacy/basic/basic.test.ts
@@ -1,9 +1,21 @@
 import { nextTestSetup, type Playwright } from 'e2e-utils'
 import { retry } from 'next-test-utils'
+import type { Page } from 'playwright'
 
 const emptyImage =
   'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
 
+const browserOptions = {
+  beforePageLoad(page: Page) {
+    // Block all image requests to external hosts immediately so we are not introducing flakes due
+    // to long DNS timeouts
+    page.route(
+      /^https:\/\/(?:example\.com|arbitraryurl\.com|example\.vercel\.sh|www\.otherhost\.com)\//,
+      (route) => route.abort()
+    )
+  },
+}
+
 describe('Image Component Tests', () => {
   const { next } = nextTestSetup({
     files: __dirname,
@@ -289,7 +301,7 @@ describe('Image Component Tests', () => {
   describe('SSR Image Component Tests', () => {
     let browser: Playwright
     beforeAll(async () => {
-      browser = await next.browser('/')
+      browser = await next.browser('/', browserOptions)
     })
     runTests(() => browser)
 
@@ -337,7 +349,7 @@ describe('Image Component Tests', () => {
       ).toBe('intrinsic')
     })
     it('should not pass config to custom loader prop', async () => {
-      const loaderBrowser = await next.browser('/loader-prop')
+      const loaderBrowser = await next.browser('/loader-prop', browserOptions)
       expect(
         await loaderBrowser.elementById('loader-prop-img').getAttribute('src')
       ).toBe('https://example.vercel.sh/success/foo.jpg?width=1024')
@@ -354,7 +366,7 @@ describe('Image Component Tests', () => {
   describe('Client-side Image Component Tests', () => {
     let browser: Playwright
     beforeAll(async () => {
-      browser = await next.browser('/')
+      browser = await next.browser('/', browserOptions)
       await browser.waitForElementByCss('#clientlink').click()
     })
     runTests(() => browser)
@@ -402,7 +414,7 @@ describe('Image Component Tests', () => {
   describe('SSR Lazy Loading Tests', () => {
     let browser: Playwright
     beforeAll(async () => {
-      browser = await next.browser('/lazy')
+      browser = await next.browser('/lazy', browserOptions)
     })
     lazyLoadingTests(() => browser)
   })
@@ -410,7 +422,7 @@ describe('Image Component Tests', () => {
   describe('Client-side Lazy Loading Tests', () => {
     let browser: Playwright
     beforeAll(async () => {
-      browser = await next.browser('/')
+      browser = await next.browser('/', browserOptions)
       await browser.waitForElementByCss('#lazylink').click()
       await new Promise((r) => setTimeout(r, 500))
     })
diff --git a/test/production/next-image-legacy/custom-resolver/custom-resolver.test.ts b/test/production/next-image-legacy/custom-resolver/custom-resolver.test.ts
index 461187763661..8d590b0260f9 100644
--- a/test/production/next-image-legacy/custom-resolver/custom-resolver.test.ts
+++ b/test/production/next-image-legacy/custom-resolver/custom-resolver.test.ts
@@ -1,4 +1,16 @@
 import { nextTestSetup, type Playwright } from 'e2e-utils'
+import type { Page } from 'playwright'
+
+const browserOptions = {
+  beforePageLoad(page: Page) {
+    // Block all image requests to external hosts immediately so we are not introducing flakes due
+    // to long DNS timeouts
+    page.route(
+      /^https:\/\/(?:customresolver\.com|arbitraryurl\.com)\//,
+      (route) => route.abort()
+    )
+  },
+}
 
 describe('Custom Resolver Tests', () => {
   const { next } = nextTestSetup({
@@ -29,7 +41,7 @@ describe('Custom Resolver Tests', () => {
   describe('SSR Custom Loader Tests', () => {
     let browser: Playwright
     beforeAll(async () => {
-      browser = await next.browser('/')
+      browser = await next.browser('/', browserOptions)
     })
     runTests(() => browser)
   })
@@ -37,7 +49,7 @@ describe('Custom Resolver Tests', () => {
   describe('Client-side Custom Loader Tests', () => {
     let browser: Playwright
     beforeAll(async () => {
-      browser = await next.browser('/client-side')
+      browser = await next.browser('/client-side', browserOptions)
     })
     runTests(() => browser)
   })