diff --git a/.azure-pipelines/publish.yml b/.azure-pipelines/publish.yml
index 4d73b41d2..6f6f6652b 100644
--- a/.azure-pipelines/publish.yml
+++ b/.azure-pipelines/publish.yml
@@ -75,7 +75,7 @@ extends:
             targetPath: $(Build.ArtifactStagingDirectory)/esrp-build
         steps:
           - checkout: none
-          - task: EsrpRelease@9
+          - task: EsrpRelease@11
             inputs:
               connectedservicename: 'Playwright-ESRP-PME'
               usemanagedidentity: true
@@ -90,7 +90,7 @@ extends:
               folderlocation: '$(Build.ArtifactStagingDirectory)/esrp-build'
               waitforreleasecompletion: true
               owners: 'yurys@microsoft.com'
-              approvers: 'maxschmitt@microsoft.com'
+              approvers: 'yurys@microsoft.com'
               serviceendpointurl: 'https://api.esrp.microsoft.com'
               mainpublisher: 'Playwright'
               domaintenantid: '975f013f-7f24-47e8-a7d3-abc4752bf346'
diff --git a/.claude/skills/playwright-java-release/SKILL.md b/.claude/skills/playwright-java-release/SKILL.md
new file mode 100644
index 000000000..e38b88689
--- /dev/null
+++ b/.claude/skills/playwright-java-release/SKILL.md
@@ -0,0 +1,76 @@
+---
+name: playwright-java-release
+description: Prepare a Playwright Java release after the rolling PR has merged — cut the release branch, mark the Maven version, draft the GitHub release, and tick the Java boxes in the internal checklist.
+---
+
+Use this skill once the `chore: roll driver to 1.X.0` PR has merged into `main` and the upstream JS `v1.X.0` is published. The rolling work itself is covered by the [[playwright-roll]] skill.
+
+Throughout this doc, replace `X` with the minor version (e.g. `60` for `1.60.0`) and `<user>` with the fork owner (`gh api user --jq .login`).
+
+The full release checklist lives in the private `microsoft/playwright-internal` repo as the `v1.X checklist` issue. Find its number once:
+
+```bash
+unset GITHUB_TOKEN
+ISSUE=$(gh search issues --repo microsoft/playwright-internal "v1.X checklist" --json number --jq '.[0].number')
+```
+
+Tick each Java box incrementally (one PATCH per item) so the issue reflects accurate state if the flow is interrupted:
+
+```bash
+gh api repos/microsoft/playwright-internal/issues/$ISSUE --jq '.body' > /tmp/body.md
+# edit /tmp/body.md to flip "- [ ]" → "- [x]" on the relevant Java item
+gh api repos/microsoft/playwright-internal/issues/$ISSUE -X PATCH --field body=@/tmp/body.md
+```
+
+## 1. Cut the release branch
+
+Push `release-1.X` from current `upstream/main` (which now contains the merged roll commit):
+
+```bash
+git fetch upstream main
+git push upstream upstream/main:refs/heads/release-1.X
+```
+
+## 2. Draft the GitHub release
+
+Generate the release notes from the upstream docs:
+
+```bash
+cd ~/playwright
+node utils/render_release_notes.mjs java 1.X > /tmp/v1.X.0-release-notes.md
+```
+
+The renderer leaves JS-isms that need fixing for Java. Apply these substitutions — the list is not exhaustive, eyeball the diff before publishing:
+
+- `toMatchAriaSnapshot()` → `matchesAriaSnapshot()`
+- `toHaveCSS()` → `hasCSS()` (and other `toHaveX` matchers → `hasX`)
+- `browser.on('context')` → `browser.onContext()`
+- `browserContext.on('download' | 'frameattached' | ...)` → `browserContext.onDownload()` / `onFrameAttached()` / …
+
+Create the draft directly against `release-1.X` — drafting against `main` and retargeting later is fragile because every `gh release edit` rotates the `untagged-<hash>` ID:
+
+```bash
+gh release create v1.X.0 --repo microsoft/playwright-java --draft \
+  --title "v1.X.0" --notes-file /tmp/v1.X.0-release-notes.md --target release-1.X
+```
+
+## 3. Bump the Maven version on the release branch
+
+Cut `mark-v-1.X.0` off `upstream/release-1.X`, run `set_maven_version.sh`, and PR back to the release branch:
+
+```bash
+git checkout -b mark-v-1.X.0 upstream/release-1.X
+./scripts/set_maven_version.sh 1.X.0
+git add -u
+git commit -m "chore: mark 1.X.0"
+git push -u origin mark-v-1.X.0
+gh pr create --repo microsoft/playwright-java --head <user>:mark-v-1.X.0 --base release-1.X \
+  --title "chore: mark 1.X.0" \
+  --body "Updates Maven version in all modules to \`1.X.0\` for the v1.X release."
+```
+
+`set_maven_version.sh` only invokes `mvn versions:set` on `pom.xml`, `tools/*/pom.xml`, and `examples/pom.xml`, but the root invocation cascades through the reactor, so the expected diff is 11 poms: root + `driver/` + `driver-bundle/` + `playwright/` (from the reactor cascade) + 6 under `tools/` + `examples/`, all flipping `1.<prev>.0-SNAPSHOT` → `1.X.0`. Any other file in the diff is a red flag.
+
+## 4. Publish
+
+The user publishes the draft release manually once the `mark-v-1.X.0` PR is merged. After publishing, CI pushes the artifacts to Maven Central and runs the Docker workflow automatically: https://github.com/microsoft/playwright-java/actions.
diff --git a/.claude/skills/playwright-roll/SKILL.md b/.claude/skills/playwright-roll/SKILL.md
new file mode 100644
index 000000000..7a37f386f
--- /dev/null
+++ b/.claude/skills/playwright-roll/SKILL.md
@@ -0,0 +1,166 @@
+---
+name: playwright-roll
+description: Roll Playwright Java to a new version
+---
+
+Help the user roll to a new version of Playwright.
+ROLLING.md contains general instructions and scripts.
+
+Start with running ./scripts/roll_driver.sh to update the version and generate the API to see the state of things.
+Afterwards, walk through the upstream changes that affect the Java client and port the relevant ones.
+
+## Determining what to port
+
+List the upstream commits that touched a client-relevant path since the last release. The paths cover everything that can change the public Java surface or the wire protocol:
+
+- `docs/src/api/` — the source of truth for `api.json`. Method/option additions, removals, and `langs:` filter changes flow from here.
+- `packages/playwright-core/src/client/` — the JS client implementation that the Java client mirrors.
+- `packages/isomorphic/` — selector engines, locator generation/parsing, and aria-snapshot logic shared between client and server. Changes here can affect client-side helpers like `getByRoleSelector`.
+- `packages/playwright/src/matchers/matchers.ts` — assertion-method definitions. Changes here usually correspond to new options on `LocatorAssertions` / `PageAssertions`.
+- `packages/protocol/src/protocol.yml` — the wire protocol schema. Method/event additions, parameter renames, and result-shape changes affect what the Java `*Impl` classes need to send/receive.
+
+```bash
+cd ~/playwright
+PREV_TAG=$(git tag | grep -E '^v1\.[0-9]+\.[0-9]+$' | sort -V | tail -1)  # e.g. v1.59.1
+git log "$PREV_TAG"..HEAD --oneline -- \
+  'docs/src/api/' \
+  'packages/playwright-core/src/client/' \
+  'packages/isomorphic/' \
+  'packages/playwright/src/matchers/matchers.ts' \
+  'packages/protocol/src/protocol.yml'
+```
+
+Walk that list top-to-bottom (oldest-first is easier — newest is at top, so reverse). For each commit:
+1. Read the commit (`git show <sha>`) to see what client/protocol/docs changed.
+2. If it's JS-internal (bundling, dispatcher conventions, electron, mcp, dashboard, trace-viewer, test-runner) — skip.
+3. If it touches `docs/src/api/` or types, check `langs:` annotations — features marked `langs: js`/`langs: js, python` don't apply to Java.
+4. If it adds/changes a public API method or option that applies to Java, port it. The api.json regenerated by `roll_driver.sh` already contains the new types/options, so the generated Java interfaces usually pick them up automatically — what's typically missing is the `*Impl` wiring.
+5. Watch for follow-up reverts — a "feat: X" commit might be undone by a later "Revert X". Check whether the change still exists in HEAD before porting.
+6. Maintain a running notes file (e.g. `/tmp/roll-notes.md`) listing each upstream PR as ported / skipped / verified-already-supported, with a one-line reason. This file becomes the body of the eventual PR.
+
+## What to include in the rolling PR
+
+- Driver version bump
+- Generated interface diffs from `roll_driver.sh`
+- `*Impl` wiring for each ported feature
+- Generator updates (import lists, special-cases) if new types appeared
+- A small test per new public API surface — listener for new events, basic call for new methods, regression for changed return types
+- PR description: list each upstream PR ported, each skipped (with reason), and each verified-already-supported
+
+Rolling includes:
+- updating client implementation to match changes in the upstream JS implementation (see ../playwright/packages/playwright-core/src/client)
+- adding a couple of new tests to verify new/changed functionality
+
+## Mimicking the JavaScript implementation
+
+The Java client is a port of the JS client in `../playwright/packages/playwright-core/src/client/`. When implementing a new or changed method, always read the corresponding JS file first and mirror its logic:
+
+```
+../playwright/packages/playwright-core/src/client/browserContext.ts
+../playwright/packages/playwright-core/src/client/page.ts
+../playwright/packages/playwright-core/src/client/tracing.ts
+../playwright/packages/playwright-core/src/client/video.ts
+../playwright/packages/playwright-core/src/client/locator.ts
+../playwright/packages/playwright-core/src/client/network.ts
+...
+```
+
+Key translation rules:
+
+**Protocol calls** — `await this._channel.methodName(params)` → `sendMessage("methodName", params, NO_TIMEOUT)`
+
+**Extracting a returned channel object from a result** — JS uses `SomeClass.from(result.foo)` which resolves the JS-side object for a channel reference. In Java, the object was already created when the server sent `__create__`, so extract it from the connection: `connection.getExistingObject(result.getAsJsonObject("foo").get("guid").getAsString())`
+
+**Async/await** — all `await` calls become synchronous `sendMessage(...)` calls since the Java client is synchronous.
+
+**`undefined` / optional params** — JS `options?.foo` checks translate to `if (options != null && options.foo != null)` null checks before adding to the params `JsonObject`.
+
+**`_channel` fields** — the JS `this._channel.foo` maps to calling `sendMessage("foo", ...)` on `this` in the Impl class.
+
+**Channel object references in params** — when a JS call passes a channel object as a param (e.g. `{ frame: frame._channel }`), in Java pass the guid: `params.addProperty("frame", ((FrameImpl) frame).guid)`.
+
+## Fixing generator and compilation errors
+
+After running `./scripts/roll_driver.sh`, the build often fails because the generated Java interfaces reference new types or methods that the generator doesn't know how to handle yet, and the `*Impl` classes don't implement new interface methods.
+
+### ApiGenerator.java fixes (tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java)
+
+The generator has hardcoded lists that control which imports are added to each generated file. When new classes appear in the API, add them to the relevant lists in `Interface.writeTo`:
+- `options.*` import list — add new classes that use types from the options package
+- `java.util.*` import list — add new classes that use `List`, `Map`, etc.
+- `java.util.function.Consumer` list — add new classes with `Consumer`-typed event handlers
+
+Type mapping: when JS-only types (like `Disposable`) are used as return types in Java-compatible methods, add a mapping in `convertBuiltinType`. For example, `Disposable` → `AutoCloseable`.
+
+Event handler generation: events with `void` type generate invalid `Consumer<void>`. Handle this case in `Event.writeListenerMethods` by emitting `Runnable` instead.
+
+After editing the generator, recompile and re-run it:
+```
+mvn -f tools/api-generator/pom.xml compile -q
+mvn -f tools/api-generator/pom.xml exec:java -Dexec.mainClass=com.microsoft.playwright.tools.ApiGenerator
+```
+
+### Impl class fixes (playwright/src/main/java/com/microsoft/playwright/impl/)
+
+After regenerating, compile `playwright/` to find what's missing:
+```
+mvn -f playwright/pom.xml compile 2>&1 | grep "ERROR"
+```
+
+Common patterns:
+
+**Return type changed (e.g. `void` → `AutoCloseable`):** Update the method signature in the Impl class and return an appropriate `AutoCloseable`. Check the JS client to see what kind of disposable is used:
+- If JS returns `DisposableObject.from(result.disposable)` — the server created a disposable channel object. Extract its guid from the protocol result and return `connection.getExistingObject(guid)` (a `DisposableObject`).
+- If JS returns `new DisposableStub(() => this.someCleanup())` — it's a local callback. Return `new DisposableStub(this::someCleanup)` in Java.
+- Examples: `addInitScript`/`exposeBinding`/`exposeFunction` → `DisposableObject`; `route(...)` → `DisposableStub(() -> unroute(...))`; `Tracing.group` → `DisposableStub(this::groupEnd)`; `Video.start` → `DisposableStub(this::stop)`.
+
+**New method missing:** Add a stub implementation. Common patterns:
+- Simple protocol message: `sendMessage("methodName", params, NO_TIMEOUT)`
+- New property accessor (e.g. from initializer): `return initializer.get("fieldName").getAsString()`
+- Delegation to mainFrame (for Page methods): `return mainFrame.locator(":root").method(...)`
+
+**New interface entirely (e.g. `Debugger`):** Create a new `*Impl` class extending `ChannelOwner`, implement the interface, and register the type in `Connection.java`'s switch statement. Initialize the field from the parent's initializer in the parent's constructor (e.g. `connection.getExistingObject(initializer.getAsJsonObject("debugger").get("guid").getAsString())`).
+
+**Field visibility:** If a field needs to be accessed from a sibling Impl class (e.g. setting `existingResponse` on `RequestImpl` from `BrowserContextImpl`), change it from `private` to package-private.
+
+**`ListenerCollection` only supports `Consumer<T>`, not `Runnable`.** For void events that use `Runnable` handlers, maintain a plain `List<Runnable>` instead.
+
+**Protocol changes that remove events** — when a method's response now returns an object directly instead of via a subsequent event, update the Impl to capture it from the `sendMessage` result and remove the old event handler. Example: `videoStart` used to fire a `"video"` page event to deliver the artifact; it now returns the artifact directly in the response. Check git history of the upstream JS client when tests hang unexpectedly.
+
+**Protocol parameter renames** — protocol parameter names can change between versions (e.g. `wsEndpoint` → `endpoint` in `BrowserType.connect`). When a test fails with `expected string, got undefined` or similar validation errors from the driver, check `packages/protocol/src/protocol.yml` for the current parameter names and update the corresponding `params.addProperty(...)` call in the Impl class. Also check the JS client (`src/client/`) to see how it builds the params object.
+
+## Rebuilding the driver-bundle after a roll
+
+`./scripts/roll_driver.sh` does the whole roll pipeline end-to-end: bumps `DRIVER_VERSION`, downloads new driver files into `driver-bundle/src/main/resources/driver/<platform>/`, regenerates `api.json` and the Java interfaces, and updates the README. When all of that succeeds, the next `mvn` invocation that touches `driver-bundle` will pick up the new files and you don't need to think about it.
+
+But if any step in the pipeline fails (the very common case is the API generator throwing on a new type — see *Fixing generator and compilation errors*), the run aborts before `driver-bundle/target/classes/` has been refreshed. From that point on, until you manually rebuild `driver-bundle`, the test JVM will load the **old** driver from the cached `target/classes`/installed jar even though the source resources have already been swapped to the new version.
+
+Fix — rebuild `driver-bundle` once before re-running tests:
+```
+mvn -f driver-bundle/pom.xml install -DskipTests
+```
+
+## Porting and verifying tests
+
+**Before porting an upstream test file, check the API exists in Java.** The upstream repo may have test files for brand-new APIs that haven't been added to the Java interface yet (e.g., `screencast.spec.ts` tests `page.screencast` which may not be in the generated `Page.java`). Check `git diff main --name-only` to see what interfaces were added this roll, and verify the method exists in the generated Java interface before porting.
+
+**Java test file names don't always match upstream spec names.** `TestScreencast.java` tests `recordVideo` video-file recording (which corresponds to `video.spec.ts`), not the newer `page.screencast` streaming API (`screencast.spec.ts`). When comparing coverage, check test *content*, not just file names.
+
+**Remove tests for behavior that was removed upstream.** When the JS client drops a client-side error check (e.g., "Page is not yet closed before saveAs", "Page did not produce any video frames"), delete the corresponding Java tests rather than trying to keep them passing. Check the upstream `tests/library/` spec to confirm the behavior is gone.
+
+**Run the full suite to catch regressions, re-run flaky failures in isolation.** Some tests (e.g., `TestClientCertificates#shouldKeepSupportingHttp`) time out only under heavy parallel load. Run the failing test alone to confirm it's flaky before investigating further.
+
+## Diagnosing hanging tests
+
+When `mvn test` hangs and surefire eventually times the JVM out, it writes thread dumps to `playwright/target/surefire-reports/<timestamp>-jvmRun*.dump`. To find the stuck test:
+
+```
+grep "com.microsoft.playwright.Test" playwright/target/surefire-reports/*-jvmRun1.dump | sort -u
+```
+
+Each line is a stack frame inside a test method — typically you'll see one or two test methods blocked on a `Future.get()`, `waitForCondition`, or similar. That's the hanging test.
+
+When you've identified a hanging test:
+1. Run it in isolation: `mvn -f playwright/pom.xml test -Dtest='TestClass#testMethod'`. If it passes alone, it's a parallel-load flake — note it but move on.
+2. If it still hangs in isolation, look for a recent fix in the upstream repo for the *same* test name. Use `git log --oneline tests/library/<spec>.spec.ts` in `~/playwright`. Upstream fixes for client-side hangs are often small and portable (e.g. `about:blank` → `server.EMPTY_PAGE` from microsoft/playwright#39840 fixed `route-web-socket.spec.ts` arraybuffer hangs — apparently some browser changed the WebSocket origin policy on `about:blank`).
+3. When porting an upstream fix, mirror the helper signature change rather than hard-coding workarounds. E.g. if upstream added a `server` parameter to `setupWS`, do the same in Java by injecting `Server server` via the JUnit fixture (`@FixtureTest` already wires up `ServerLifecycle`, so adding `Server server` to the test method signature is enough — no class-level boilerplate). Watch for local-variable shadowing when you add a `Server server` parameter to a method that already has a `WebSocketRoute server` local; rename the local.
diff --git a/.github/workflows/publish_docker.yml b/.github/workflows/publish_docker.yml
index 0a63b012b..d0a35182b 100644
--- a/.github/workflows/publish_docker.yml
+++ b/.github/workflows/publish_docker.yml
@@ -13,9 +13,9 @@ jobs:
     environment: Docker
     if: github.repository == 'microsoft/playwright-java'
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
     - name: Azure login
-      uses: azure/login@v2
+      uses: azure/login@v3
       with:
         client-id: ${{ secrets.AZURE_DOCKER_CLIENT_ID }}
         tenant-id: ${{ secrets.AZURE_DOCKER_TENANT_ID }}
@@ -23,8 +23,8 @@ jobs:
     - name: Login to ACR via OIDC
       run: az acr login --name playwright
     - name: Set up Docker QEMU for arm64 docker builds
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v4
       with:
         platforms: arm64
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
     - run: ./utils/docker/publish_docker.sh stable
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e466c00cf..2b6878985 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,11 +18,19 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         browser: [chromium, firefox, webkit]
+        exclude:
+          # macos-latest is the free M1 runner (3 vCPU / 7 GB); WebKit needs more headroom.
+          # Upstream's webkit matrix runs on macos-15-xlarge for the same reason.
+          - os: macos-latest
+            browser: webkit
+        include:
+          - os: macos-15-xlarge
+            browser: webkit
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v5.6.0
       with:
         distribution: zulu
         java-version: 8
@@ -65,13 +73,13 @@ jobs:
             browser-channel: msedge
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: Install Media Pack
         if: matrix.os == 'windows-latest'
         shell: powershell
         run: Install-WindowsFeature Server-Media-Foundation
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v5.6.0
         with:
           distribution: zulu
           java-version: 8
@@ -100,9 +108,9 @@ jobs:
         browser: [chromium, firefox, webkit]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: Set up JDK 21
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v5.6.0
         with:
           distribution: adopt
           java-version: 21
diff --git a/.github/workflows/test_cli.yml b/.github/workflows/test_cli.yml
index 718f8489a..8d6c0cb11 100644
--- a/.github/workflows/test_cli.yml
+++ b/.github/workflows/test_cli.yml
@@ -13,9 +13,9 @@ jobs:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: Cache Maven packages
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
index 0658ee4b9..7512941d6 100644
--- a/.github/workflows/test_docker.yml
+++ b/.github/workflows/test_docker.yml
@@ -26,26 +26,51 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        flavor: [jammy, noble]
+        flavor: [jammy, noble, resolute]
         runs-on: [ubuntu-24.04, ubuntu-24.04-arm]
+        include:
+          - runs-on: ubuntu-24.04
+            arch: amd64
+          - runs-on: ubuntu-24.04-arm
+            arch: arm64
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: Build Docker image
         run: |
-          ARCH="${{ matrix.runs-on == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}"
-          bash utils/docker/build.sh --$ARCH ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
+          bash utils/docker/build.sh --${{ matrix.arch }} ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
       - name: Start container
         run: |
-            CONTAINER_ID=$(docker run --rm -e CI -e PW_MAX_RETRIES --ipc=host -v "$(pwd)":/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)
+            CONTAINER_ID=$(docker run \
+              --rm \
+              --name playwright-docker-test \
+              --platform linux/${{ matrix.arch }} \
+              --user=pwuser \
+              --workdir /home/pwuser \
+              --shm-size=2g \
+              -e CI \
+              -e PW_MAX_RETRIES \
+              -d -t \
+              playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)
             echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
 
-      - name: Run test in container
+      - name: Copy repository inside docker container
         run: |
-            docker exec "$CONTAINER_ID" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh
+            docker cp . "$CONTAINER_ID":/home/pwuser/playwright
+            # /root/.m2 was populated as root during image build; move it to
+            # pwuser so the locally-installed SNAPSHOT artifacts resolve.
+            docker exec --user root "$CONTAINER_ID" bash -c '
+              chown -R pwuser /home/pwuser/playwright
+              mv /root/.m2 /home/pwuser/.m2
+              chown -R pwuser /home/pwuser/.m2
+            '
+
+      - name: Run smoke tests in container
+        run: |
+            docker exec "$CONTAINER_ID" /home/pwuser/playwright/tools/test-local-installation/create_project_and_run_tests.sh -Dgroups=smoke
 
       - name: Test ClassLoader
         run: |
-            docker exec "${CONTAINER_ID}" /root/playwright/tools/test-spring-boot-starter/package_and_run_async_test.sh
+            docker exec "${CONTAINER_ID}" /home/pwuser/playwright/tools/test-spring-boot-starter/package_and_run_async_test.sh
 
       - name: Stop container
         run: |
diff --git a/.github/workflows/verify_api.yml b/.github/workflows/verify_api.yml
index 5b9d28f34..a67da2807 100644
--- a/.github/workflows/verify_api.yml
+++ b/.github/workflows/verify_api.yml
@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: Download drivers
         run: scripts/download_driver.sh
       - name: Regenerate APIs
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 000000000..1433460ef
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,48 @@
+# Playwright Java
+
+The Java client is a port of the JavaScript client in `../playwright/packages/playwright-core/src/client/`. When implementing or changing a method, read the corresponding JS file first and mirror its logic.
+
+Project checkouts (including the upstream `playwright` repo) live in the parent directory (`../`). Use the `gh` cli to interact with GitHub.
+
+## Commit Convention
+
+Semantic commit messages: `label(scope): description`
+
+Labels: `fix`, `feat`, `chore`, `docs`, `test`, `devops`
+
+```bash
+git checkout -b fix-39562
+# ... make changes ...
+git add <changed-files>
+git commit -m "$(cat <<'EOF'
+fix(proxy): handle SOCKS proxy authentication
+
+Fixes: https://github.com/microsoft/playwright-java/issues/39562
+EOF
+)"
+# **Never `git push` without an explicit instruction to push.**
+git push origin fix-39562
+gh pr create --repo microsoft/playwright-java --head <user>:fix-39562 \
+  --title "fix(proxy): handle SOCKS proxy authentication" \
+  --body "$(cat <<'EOF'
+## Summary
+- <describe the change very! briefly>
+
+Fixes https://github.com/microsoft/playwright-java/issues/39562
+EOF
+)"
+```
+
+Never add Co-Authored-By agents in commit message.
+Never add "Generated with" in commit message.
+Never add test plan to PR description. Keep PR description short — a few bullet points at most.
+Branch naming for issue fixes: `fix-<issue-number>`.
+
+**Never amend commits.** Always create a new commit for follow-up changes, even when iterating on an open PR. Amending rewrites history and forces a force-push, losing the incremental review trail. Only amend if the user explicitly says so.
+
+**Never `git push` without an explicit instruction to push.** Applies even when a PR is already open for the branch — additional commits are immediately visible to reviewers. Commit locally, report what was committed, and wait. Only push when the user's message contains "push", "upload", "create PR", "ship it", or equivalent.
+
+## Skills
+
+- **playwright-roll** (`.claude/skills/playwright-roll/SKILL.md`) — roll Playwright Java to a new upstream version: bump the driver, regenerate the API, and port relevant upstream changes.
+- **playwright-java-release** (`.claude/skills/playwright-java-release/SKILL.md`) — prepare a release after the rolling PR merges: cut the release branch, mark the Maven version, and draft the GitHub release.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0fa9b18c0..1a54c0547 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,20 @@
 # Contributing
 
+## Choosing an Issue
+
+To maintain project quality and focus, Playwright **requires a corresponding issue** for every contribution, with the exception of minor documentation fixes.
+
+If you would like to address a bug or feature that isn't currently listed, **please file a new issue first**. This allows the community and maintainers to provide early feedback and facilitates a discussion before you invest time in developing a pull request.
+
+When submitting an issue, please state clearly if you intend to work on it. Once triaged and approved, the maintainers will determine the best path forward—whether the task should be handled by the **core team**, an **automated agent**, or a **community contributor**. If the issue is assigned to you, you may then proceed with your changes and submit a PR.
+
+### Submission Policy
+To ensure the maintainability of the project, please note the following:
+
+* **Unsolicited PRs:** Pull requests submitted without a linked issue or prior approval will be closed.
+* **Low-Quality AI Contributions:** PRs that do not meet our quality standards or lack human oversight (including low-quality agentic submissions) will be closed without explanation.
+* **Approval Required:** Only proceed with a PR once the issue has been officially assigned to you or approved for community contribution.
+
 ## How to Contribute
 
 ### Installing Developer Tools
@@ -20,12 +35,14 @@ git clone https://github.com/microsoft/playwright-java
 cd playwright-java
 ```
 
-2. Run the following script to download Playwright driver for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).
+2. Run the following script to download and assemble the Playwright driver. The platform-independent `playwright-core` package is assembled once into `driver/src/main/resources/driver/package/`, and the Node.js binary for each platform into `driver-bundle/src/main/resources/driver/<platform>/` (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).
 
 ```bash
 scripts/download_driver.sh
 ```
 
+Each driver is assembled from the [`playwright-core`](https://www.npmjs.com/package/playwright-core) npm package (version pinned in [scripts/DRIVER_VERSION](scripts/DRIVER_VERSION)) and the matching Node.js binary from https://nodejs.org, the same way the upstream Playwright build does it.
+
 ### Building and running the tests with Maven
 
 ```bash
@@ -39,10 +56,9 @@ BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes
 
 ### Generating API
 
-Public Java API is generated from api.json which is produced by `print-api-json` command of playwright CLI. To regenerate Java interfaces for the current driver run the following commands:
+Public Java API is generated from api.json, which is generated from the upstream Playwright source at the exact commit that produced the driver version in [scripts/DRIVER_VERSION](scripts/DRIVER_VERSION) (resolved via `npm view playwright@<version> gitHead`). `scripts/generate_api.sh` fetches a minimal upstream checkout automatically; set `PW_SRC_DIR` to reuse an existing `microsoft/playwright` checkout instead. To regenerate Java interfaces for the current driver run:
 
 ```bash
-./scripts/download_driver.sh
 ./scripts/generate_api.sh
 ```
 
diff --git a/README.md b/README.md
index b6289e1ed..ccbe72f64 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->141.0.7390.37<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->26.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->142.0.1<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->151.0.7922.34<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->26.5<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->153.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 ## Documentation
 
diff --git a/ROLLING.md b/ROLLING.md
index c66d49bdc..bb57d2577 100644
--- a/ROLLING.md
+++ b/ROLLING.md
@@ -2,18 +2,6 @@
 
 * make sure to have at least Java 8 and Maven 3.6.3
 * clone playwright for java: http://github.com/microsoft/playwright-java
-* `./scripts/roll_driver.sh 1.47.0-beta-1726138322000`
+* roll the driver and update generated sources: `./scripts/roll_driver.sh next`
+* fix any errors
 * commit & send PR with the roll
-
-## Finding driver version
-
-For development versions of Playwright, you can find the latest version by looking at [publish_canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) workflow -> `publish canary NPM & Publish canary Docker` -> `build & publish driver` step -> `PACKAGE_VERSION`
-<img width="960" alt="image" src="https://github.com/microsoft/playwright-java/assets/9798949/4f33a7f1-b39a-4179-8ae7-fb1d84094c75">
-
-
-# Updating Version
-
-```bash
-./scripts/set_maven_version.sh 1.15.0
-```
-
diff --git a/driver-bundle/pom.xml b/driver-bundle/pom.xml
index 7e3eaf390..1f65521ad 100644
--- a/driver-bundle/pom.xml
+++ b/driver-bundle/pom.xml
@@ -10,22 +10,27 @@
   </parent>
 
   <artifactId>driver-bundle</artifactId>
-  <name>Playwright - Drivers For All Platforms</name>
+  <name>Playwright - Node.js For All Platforms</name>
   <description>
-    This module includes Playwright driver and related utilities for all supported platforms.
-    It is intended to be used on the systems where Playwright driver is not preinstalled.
+    Node.js binaries for the Playwright driver on every supported platform. Can be excluded when
+    Node.js is preinstalled on the host (see PLAYWRIGHT_NODEJS_PATH).
   </description>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.microsoft.playwright</groupId>
-      <artifactId>driver</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-  </dependencies>
+  <properties>
+    <automatic.module.name>com.microsoft.playwright.driver.bundle</automatic.module.name>
+  </properties>
+
+  <build>
+    <plugins>
+      <!-- The Node.js binaries for all platforms live in src/main/resources and must not
+           be packaged into the sources JAR (see issue #1913). -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <excludeResources>true</excludeResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/driver/pom.xml b/driver/pom.xml
index 1f1e7df9d..bf621037f 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -12,13 +12,32 @@
   <artifactId>driver</artifactId>
   <name>Playwright - Driver</name>
   <description>
-    This module provides API for discovery and launching of Playwright driver.
+    API for launching the Playwright driver. Bundles the platform-independent playwright-core
+    package; the Node.js binary comes from the driver-bundle module or a preinstalled Node.js.
   </description>
 
+  <properties>
+    <automatic.module.name>com.microsoft.playwright.driver</automatic.module.name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <!-- The playwright-core package lives in src/main/resources and must not be packaged
+           into the sources JAR (see issue #1913). -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <excludeResources>true</excludeResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/driver/src/main/java/com/microsoft/playwright/impl/driver/Driver.java b/driver/src/main/java/com/microsoft/playwright/impl/driver/Driver.java
index 092d290ab..517650dea 100644
--- a/driver/src/main/java/com/microsoft/playwright/impl/driver/Driver.java
+++ b/driver/src/main/java/com/microsoft/playwright/impl/driver/Driver.java
@@ -25,12 +25,14 @@
 
 /**
  * This class provides access to playwright-cli. It can be either preinstalled
- * in the host system and its path is passed as a system property or it can be
- * loaded from the driver-bundle module if that module is in the classpath.
+ * in the host system and its path is passed as a system property, or it can be
+ * loaded from the classpath: the platform-independent driver code ships in the
+ * driver module and the Node.js binary in the optional driver-bundle module.
  */
 public abstract class Driver {
   protected final Map<String, String> env = new LinkedHashMap<>(System.getenv());
   public static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
+  public static final String PLAYWRIGHT_DRIVER_DIR = "PLAYWRIGHT_DRIVER_DIR";
 
   private static Driver instance;
 
@@ -107,9 +109,12 @@ public static Driver createAndInstall(Map<String, String> env, Boolean installBr
   }
 
   private static Driver newInstance() throws Exception {
-    String pathFromProperty = System.getProperty("playwright.cli.dir");
-    if (pathFromProperty != null) {
-      return new PreinstalledDriver(Paths.get(pathFromProperty));
+    String driverDir = System.getProperty("playwright.cli.dir");
+    if (driverDir == null) {
+      driverDir = System.getenv(PLAYWRIGHT_DRIVER_DIR);
+    }
+    if (driverDir != null) {
+      return new PreinstalledDriver(Paths.get(driverDir));
     }
 
     String driverImpl =
diff --git a/driver-bundle/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java b/driver/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java
similarity index 78%
rename from driver-bundle/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java
rename to driver/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java
index 654ff6732..4e35d21c5 100644
--- a/driver-bundle/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java
+++ b/driver/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java
@@ -30,17 +30,11 @@ public class DriverJar extends Driver {
   private static final String PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD";
   private static final String SELENIUM_REMOTE_URL = "SELENIUM_REMOTE_URL";
   private final Path driverTempDir;
+  private final boolean deleteOnExit;
   private Path preinstalledNodePath;
 
   public DriverJar() throws IOException {
-    // Allow specifying custom path for the driver installation
-    // See https://github.com/microsoft/playwright-java/issues/728
-    String alternativeTmpdir = System.getProperty("playwright.driver.tmpdir");
-    String prefix = "playwright-java-";
-    driverTempDir = alternativeTmpdir == null
-      ? Files.createTempDirectory(prefix)
-      : Files.createTempDirectory(Paths.get(alternativeTmpdir), prefix);
-    driverTempDir.toFile().deleteOnExit();
+    this(createTempDriverDir(), true);
     String nodePath = System.getProperty("playwright.nodejs.path");
     if (nodePath != null) {
       preinstalledNodePath = Paths.get(nodePath);
@@ -51,6 +45,32 @@ public DriverJar() throws IOException {
     logMessage("created DriverJar: " + driverTempDir);
   }
 
+  private DriverJar(Path driverDir, boolean deleteOnExit) {
+    this.driverTempDir = driverDir;
+    this.deleteOnExit = deleteOnExit;
+    if (deleteOnExit) {
+      driverTempDir.toFile().deleteOnExit();
+    }
+  }
+
+  private static Path createTempDriverDir() throws IOException {
+    // Allow specifying custom path for the driver installation
+    // See https://github.com/microsoft/playwright-java/issues/728
+    String alternativeTmpdir = System.getProperty("playwright.driver.tmpdir");
+    String prefix = "playwright-java-";
+    return alternativeTmpdir == null
+      ? Files.createTempDirectory(prefix)
+      : Files.createTempDirectory(Paths.get(alternativeTmpdir), prefix);
+  }
+
+  // Extracts the driver (playwright-core package and the Node.js binary for the current platform)
+  // into the given directory, persistently. Point playwright.cli.dir / PLAYWRIGHT_DRIVER_DIR at it
+  // to run without extracting to a temp directory on every launch. See issue #1268.
+  public static void installDriverTo(Path driverDir) throws IOException, URISyntaxException {
+    Files.createDirectories(driverDir);
+    new DriverJar(driverDir, false).extractDriverToTempDir();
+  }
+
   @Override
   protected void initialize(Boolean installBrowsers) throws Exception {
     if (preinstalledNodePath == null && env.containsKey(PLAYWRIGHT_NODEJS_PATH)) {
@@ -119,7 +139,21 @@ public static URI getDriverResourceURI() throws URISyntaxException {
   }
 
   void extractDriverToTempDir() throws URISyntaxException, IOException {
-    URI originalUri = getDriverResourceURI();
+    extractResourceToDir("driver/package", driverTempDir.resolve("package"));
+    if (preinstalledNodePath == null) {
+      String platformResource = "driver/" + platformDir();
+      if (DriverJar.class.getClassLoader().getResource(platformResource) == null) {
+        throw new RuntimeException("Failed to find the bundled Node.js for platform '" + platformDir()
+          + "'. Add the com.microsoft.playwright:driver-bundle dependency, or set the "
+          + PLAYWRIGHT_NODEJS_PATH + " environment variable (or the playwright.nodejs.path system "
+          + "property) to point at a preinstalled Node.js.");
+      }
+      extractResourceToDir(platformResource, driverTempDir);
+    }
+  }
+
+  private void extractResourceToDir(String resourcePath, Path destDir) throws URISyntaxException, IOException {
+    URI originalUri = DriverJar.class.getClassLoader().getResource(resourcePath).toURI();
     URI uri = maybeExtractNestedJar(originalUri);
 
     // Create zip filesystem if loading from jar.
@@ -131,14 +165,8 @@ void extractDriverToTempDir() throws URISyntaxException, IOException {
       // See https://github.com/microsoft/playwright-java/issues/306
       Path srcRootDefaultFs = Paths.get(srcRoot.toString());
       Files.walk(srcRoot).forEach(fromPath -> {
-        if (preinstalledNodePath != null) {
-          String fileName = fromPath.getFileName().toString();
-          if ("node.exe".equals(fileName) || "node".equals(fileName)) {
-            return;
-          }
-        }
         Path relative = srcRootDefaultFs.relativize(Paths.get(fromPath.toString()));
-        Path toPath = driverTempDir.resolve(relative.toString());
+        Path toPath = destDir.resolve(relative.toString());
         try {
           if (Files.isDirectory(fromPath)) {
             Files.createDirectories(toPath);
@@ -148,7 +176,9 @@ void extractDriverToTempDir() throws URISyntaxException, IOException {
               toPath.toFile().setExecutable(true, true);
             }
           }
-          toPath.toFile().deleteOnExit();
+          if (deleteOnExit) {
+            toPath.toFile().deleteOnExit();
+          }
         } catch (IOException e) {
           throw new RuntimeException("Failed to extract driver from " + uri + ", full uri: " + originalUri, e);
         }
@@ -171,7 +201,9 @@ private URI maybeExtractNestedJar(final URI uri) throws URISyntaxException {
       Path fromPath = Paths.get(jarUri);
       Path toPath = driverTempDir.resolve(fromPath.getFileName().toString());
       Files.copy(fromPath, toPath);
-      toPath.toFile().deleteOnExit();
+      if (deleteOnExit) {
+        toPath.toFile().deleteOnExit();
+      }
       return new URI("jar:" + toPath.toUri() + JAR_URL_SEPARATOR + parts[2]);
     } catch (IOException e) {
       throw new RuntimeException("Failed to extract driver's nested .jar from " + jarUri + "; full uri: " + uri, e);
diff --git a/driver/src/main/resources/.gitignore b/driver/src/main/resources/.gitignore
new file mode 100644
index 000000000..045408616
--- /dev/null
+++ b/driver/src/main/resources/.gitignore
@@ -0,0 +1,2 @@
+driver/
+local-driver/
diff --git a/examples/pom.xml b/examples/pom.xml
index 63ea119f8..012777b53 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -10,7 +10,7 @@
   <name>Playwright Client Examples</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <playwright.version>1.56.0</playwright.version>
+    <playwright.version>1.62.0</playwright.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/playwright/pom.xml b/playwright/pom.xml
index 3e3dfa9b5..2c927d88c 100644
--- a/playwright/pom.xml
+++ b/playwright/pom.xml
@@ -19,6 +19,10 @@
     This is the main package that provides Playwright client.
   </description>
 
+  <properties>
+    <automatic.module.name>com.microsoft.playwright</automatic.module.name>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -37,6 +41,14 @@
             <goals>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <!-- A name of its own, so the main jar and the test-jar never claim the same module. -->
+                  <Automatic-Module-Name>com.microsoft.playwright.test</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/playwright/src/main/java/com/microsoft/playwright/APIRequestContext.java b/playwright/src/main/java/com/microsoft/playwright/APIRequestContext.java
index 34b25000d..e7449fe26 100644
--- a/playwright/src/main/java/com/microsoft/playwright/APIRequestContext.java
+++ b/playwright/src/main/java/com/microsoft/playwright/APIRequestContext.java
@@ -23,24 +23,23 @@
  * This API is used for the Web API testing. You can use it to trigger API endpoints, configure micro-services, prepare
  * environment or the service to your e2e test.
  *
- * <p> Each Playwright browser context has associated with it {@code APIRequestContext} instance which shares cookie storage
- * with the browser context and can be accessed via {@link com.microsoft.playwright.BrowserContext#request
- * BrowserContext.request()} or {@link com.microsoft.playwright.Page#request Page.request()}. It is also possible to create
- * a new APIRequestContext instance manually by calling {@link com.microsoft.playwright.APIRequest#newContext
- * APIRequest.newContext()}.
+ * <p> Each Playwright browser context has an associated {@code APIRequestContext}, accessible via {@link
+ * com.microsoft.playwright.BrowserContext#request BrowserContext.request()} or {@link
+ * com.microsoft.playwright.Page#request Page.request()} (these return the
+ *
+ * <p> **same instance** — {@code page.request} is a shortcut for {@code page.context().request}). You can also create a
+ * standalone, isolated instance with {@link com.microsoft.playwright.APIRequest#newContext APIRequest.newContext()}.
  *
  * <p> <strong>Cookie management</strong>
  *
- * <p> {@code APIRequestContext} returned by {@link com.microsoft.playwright.BrowserContext#request BrowserContext.request()}
- * and {@link com.microsoft.playwright.Page#request Page.request()} shares cookie storage with the corresponding {@code
- * BrowserContext}. Each API request will have {@code Cookie} header populated with the values from the browser context. If
- * the API response contains {@code Set-Cookie} header it will automatically update {@code BrowserContext} cookies and
- * requests made from the page will pick them up. This means that if you log in using this API, your e2e test will be
- * logged in and vice versa.
+ * <p> The {@code APIRequestContext} returned by {@link com.microsoft.playwright.BrowserContext#request
+ * BrowserContext.request()} and
+ *
+ * <p> {@link com.microsoft.playwright.Page#request Page.request()} uses the same cookie jar as its {@code BrowserContext}:
  *
- * <p> If you want API requests to not interfere with the browser cookies you should create a new {@code APIRequestContext} by
- * calling {@link com.microsoft.playwright.APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext}
- * object will have its own isolated cookie storage.
+ * <p> If you want API requests that do **not** share cookies with the browser, create an isolated context via {@link
+ * com.microsoft.playwright.APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext} object will have
+ * its own isolated cookie storage.
  */
 public interface APIRequestContext {
   class DisposeOptions {
@@ -484,5 +483,11 @@ default String storageState() {
    * @since v1.16
    */
   String storageState(StorageStateOptions options);
+  /**
+   *
+   *
+   * @since v1.60
+   */
+  Tracing tracing();
 }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/APIResponse.java b/playwright/src/main/java/com/microsoft/playwright/APIResponse.java
index f9409166b..c52f1d31e 100644
--- a/playwright/src/main/java/com/microsoft/playwright/APIResponse.java
+++ b/playwright/src/main/java/com/microsoft/playwright/APIResponse.java
@@ -55,6 +55,20 @@ public interface APIResponse {
    * @since v1.16
    */
   boolean ok();
+  /**
+   * Returns SSL and other security information. Resolves to {@code null} for non-HTTPS responses. For redirected requests,
+   * returns the information for the last request in the redirect chain.
+   *
+   * @since v1.61
+   */
+  SecurityDetails securityDetails();
+  /**
+   * Returns the IP address and port of the server. Resolves to {@code null} if the server address is not available. For
+   * redirected requests, returns the information for the last request in the redirect chain.
+   *
+   * @since v1.61
+   */
+  ServerAddr serverAddr();
   /**
    * Contains the status code of the response (e.g., 200 for a success).
    *
@@ -73,6 +87,16 @@ public interface APIResponse {
    * @since v1.16
    */
   String text();
+  /**
+   * Returns resource timing information for given response. For redirected requests, returns the information for the last
+   * request in the redirect chain. When the response is served <a
+   * href="https://playwright.dev/java/docs/mock#replaying-from-har">from the HAR file</a>, timing information is not
+   * available and all the values are -1. Find more information at <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming">Resource Timing API</a>.
+   *
+   * @since v1.62
+   */
+  Timing timing();
   /**
    * Contains the URL of the response.
    *
diff --git a/playwright/src/main/java/com/microsoft/playwright/Browser.java b/playwright/src/main/java/com/microsoft/playwright/Browser.java
index 793ea1dc5..f3d5a6a03 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Browser.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Browser.java
@@ -43,6 +43,15 @@
  */
 public interface Browser extends AutoCloseable {
 
+  /**
+   * Emitted when a new browser context is created.
+   */
+  void onContext(Consumer<BrowserContext> handler);
+  /**
+   * Removes handler that was previously added with {@link #onContext onContext(handler)}.
+   */
+  void offContext(Consumer<BrowserContext> handler);
+
   /**
    * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the following:
    * <ul>
@@ -1222,6 +1231,44 @@ public NewPageOptions setViewportSize(ViewportSize viewportSize) {
       return this;
     }
   }
+  class BindOptions {
+    /**
+     * Host to bind the web socket server to. When specified, a web socket server is created instead of a named pipe.
+     */
+    public String host;
+    /**
+     * Port to bind the web socket server to. When specified, a web socket server is created instead of a named pipe. Use
+     * {@code 0} to let the OS pick an available port.
+     */
+    public Integer port;
+    /**
+     * Working directory associated with this browser server.
+     */
+    public String workspaceDir;
+
+    /**
+     * Host to bind the web socket server to. When specified, a web socket server is created instead of a named pipe.
+     */
+    public BindOptions setHost(String host) {
+      this.host = host;
+      return this;
+    }
+    /**
+     * Port to bind the web socket server to. When specified, a web socket server is created instead of a named pipe. Use
+     * {@code 0} to let the OS pick an available port.
+     */
+    public BindOptions setPort(int port) {
+      this.port = port;
+      return this;
+    }
+    /**
+     * Working directory associated with this browser server.
+     */
+    public BindOptions setWorkspaceDir(String workspaceDir) {
+      this.workspaceDir = workspaceDir;
+      return this;
+    }
+  }
   class StartTracingOptions {
     /**
      * specify custom categories to use instead of default.
@@ -1404,6 +1451,22 @@ default Page newPage() {
    * @since v1.8
    */
   Page newPage(NewPageOptions options);
+  /**
+   * Binds the browser to a named pipe or web socket, making it available for other clients to connect to.
+   *
+   * @param title Title of the browser server, used for identification.
+   * @since v1.59
+   */
+  default BindResult bind(String title) {
+    return bind(title, null);
+  }
+  /**
+   * Binds the browser to a named pipe or web socket, making it available for other clients to connect to.
+   *
+   * @param title Title of the browser server, used for identification.
+   * @since v1.59
+   */
+  BindResult bind(String title, BindOptions options);
   /**
    * <strong>NOTE:</strong> This API controls <a href="https://www.chromium.org/developers/how-tos/trace-event-profiling-tool">Chromium Tracing</a>
    * which is a low-level chromium-specific debugging tool. API to control <a
@@ -1484,6 +1547,12 @@ default void startTracing() {
    * @since v1.11
    */
   byte[] stopTracing();
+  /**
+   * Unbinds the browser server previously bound with {@link com.microsoft.playwright.Browser#bind Browser.bind()}.
+   *
+   * @since v1.59
+   */
+  void unbind();
   /**
    * Returns the browser version.
    *
diff --git a/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java b/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java
index 1e651aa91..2cff8345f 100644
--- a/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java
+++ b/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java
@@ -114,6 +114,48 @@ public interface BrowserContext extends AutoCloseable {
    */
   void offDialog(Consumer<Dialog> handler);
 
+  /**
+   * Emitted when attachment download started in any page belonging to this context. User can access basic file operations on
+   * downloaded content via the passed {@code Download} instance. See also {@link com.microsoft.playwright.Page#onDownload
+   * Page.onDownload()} to receive events about a specific page.
+   */
+  void onDownload(Consumer<Download> handler);
+  /**
+   * Removes handler that was previously added with {@link #onDownload onDownload(handler)}.
+   */
+  void offDownload(Consumer<Download> handler);
+
+  /**
+   * Emitted when a frame is attached in any page belonging to this context. See also {@link
+   * com.microsoft.playwright.Page#onFrameAttached Page.onFrameAttached()} to receive events about a specific page.
+   */
+  void onFrameAttached(Consumer<Frame> handler);
+  /**
+   * Removes handler that was previously added with {@link #onFrameAttached onFrameAttached(handler)}.
+   */
+  void offFrameAttached(Consumer<Frame> handler);
+
+  /**
+   * Emitted when a frame is detached in any page belonging to this context. See also {@link
+   * com.microsoft.playwright.Page#onFrameDetached Page.onFrameDetached()} to receive events about a specific page.
+   */
+  void onFrameDetached(Consumer<Frame> handler);
+  /**
+   * Removes handler that was previously added with {@link #onFrameDetached onFrameDetached(handler)}.
+   */
+  void offFrameDetached(Consumer<Frame> handler);
+
+  /**
+   * Emitted when a frame is navigated to a new url in any page belonging to this context. See also {@link
+   * com.microsoft.playwright.Page#onFrameNavigated Page.onFrameNavigated()} to receive events about navigations in a
+   * specific page.
+   */
+  void onFrameNavigated(Consumer<Frame> handler);
+  /**
+   * Removes handler that was previously added with {@link #onFrameNavigated onFrameNavigated(handler)}.
+   */
+  void offFrameNavigated(Consumer<Frame> handler);
+
   /**
    * The event is emitted when a new Page is created in the BrowserContext. The page may still be loading. The event will
    * also fire for popup pages. See also {@link com.microsoft.playwright.Page#onPopup Page.onPopup()} to receive events about
@@ -141,6 +183,27 @@ public interface BrowserContext extends AutoCloseable {
    */
   void offPage(Consumer<Page> handler);
 
+  /**
+   * Emitted when a page in this context is closed. See also {@link com.microsoft.playwright.Page#onClose Page.onClose()} to
+   * receive events about a specific page.
+   */
+  void onPageClose(Consumer<Page> handler);
+  /**
+   * Removes handler that was previously added with {@link #onPageClose onPageClose(handler)}.
+   */
+  void offPageClose(Consumer<Page> handler);
+
+  /**
+   * Emitted when the JavaScript <a href="https://developer.mozilla.org/en-US/docs/Web/Events/load">{@code load}</a> event is
+   * dispatched in any page belonging to this context. See also {@link com.microsoft.playwright.Page#onLoad Page.onLoad()} to
+   * receive events about a specific page.
+   */
+  void onPageLoad(Consumer<Page> handler);
+  /**
+   * Removes handler that was previously added with {@link #onPageLoad onPageLoad(handler)}.
+   */
+  void offPageLoad(Consumer<Page> handler);
+
   /**
    * Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular page,
    * use {@link com.microsoft.playwright.Page#onPageError Page.onPageError()} instead.
@@ -271,20 +334,6 @@ public CloseOptions setReason(String reason) {
       return this;
     }
   }
-  class ExposeBindingOptions {
-    /**
-     * @deprecated This option will be removed in the future.
-     */
-    public Boolean handle;
-
-    /**
-     * @deprecated This option will be removed in the future.
-     */
-    public ExposeBindingOptions setHandle(boolean handle) {
-      this.handle = handle;
-      return this;
-    }
-  }
   class GrantPermissionsOptions {
     /**
      * The [origin] to grant permissions to, e.g. "https://example.com".
@@ -400,6 +449,16 @@ public RouteFromHAROptions setUrl(Pattern url) {
     }
   }
   class StorageStateOptions {
+    /**
+     * Set to {@code true} to include the context's virtual WebAuthn {@link com.microsoft.playwright.BrowserContext#credentials
+     * BrowserContext.credentials()} (passkeys) in the storage state snapshot. The captured credentials carry their private
+     * keys, so they can be re-seeded into a later context via the {@code storageState} option or {@link
+     * com.microsoft.playwright.BrowserContext#setStorageState BrowserContext.setStorageState()}. Note that restoring the
+     * storage state that contains credentials will automatically install the virtual WebAuthn authenticator (see {@link
+     * com.microsoft.playwright.Credentials#install Credentials.install()}), and prevent all real authenticators from working
+     * in this context.
+     */
+    public Boolean credentials;
     /**
      * Set to {@code true} to include <a href="https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API">IndexedDB</a> in
      * the storage state snapshot. If your application uses IndexedDB to store authentication tokens, like Firebase
@@ -412,6 +471,19 @@ class StorageStateOptions {
      */
     public Path path;
 
+    /**
+     * Set to {@code true} to include the context's virtual WebAuthn {@link com.microsoft.playwright.BrowserContext#credentials
+     * BrowserContext.credentials()} (passkeys) in the storage state snapshot. The captured credentials carry their private
+     * keys, so they can be re-seeded into a later context via the {@code storageState} option or {@link
+     * com.microsoft.playwright.BrowserContext#setStorageState BrowserContext.setStorageState()}. Note that restoring the
+     * storage state that contains credentials will automatically install the virtual WebAuthn authenticator (see {@link
+     * com.microsoft.playwright.Credentials#install Credentials.install()}), and prevent all real authenticators from working
+     * in this context.
+     */
+    public StorageStateOptions setCredentials(boolean credentials) {
+      this.credentials = credentials;
+      return this;
+    }
     /**
      * Set to {@code true} to include <a href="https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API">IndexedDB</a> in
      * the storage state snapshot. If your application uses IndexedDB to store authentication tokens, like Firebase
@@ -514,6 +586,19 @@ public WaitForPageOptions setTimeout(double timeout) {
    * @since v1.45
    */
   Clock clock();
+  /**
+   * Virtual WebAuthn authenticator for this context. Lets tests seed credentials and intercept {@code
+   * navigator.credentials.create()} / {@code navigator.credentials.get()} ceremonies.
+   *
+   * @since v1.61
+   */
+  Credentials credentials();
+  /**
+   * Debugger allows to pause and resume the execution.
+   *
+   * @since v1.59
+   */
+  Debugger debugger();
   /**
    * Adds cookies into this browser context. All pages within this context will have these cookies installed. Cookies can be
    * obtained via {@link com.microsoft.playwright.BrowserContext#cookies BrowserContext.cookies()}.
@@ -552,7 +637,7 @@ public WaitForPageOptions setTimeout(double timeout) {
    * @param script Script to be evaluated in all pages in the browser context.
    * @since v1.8
    */
-  void addInitScript(String script);
+  AutoCloseable addInitScript(String script);
   /**
    * Adds a script which would be evaluated in one of the following scenarios:
    * <ul>
@@ -579,7 +664,7 @@ public WaitForPageOptions setTimeout(double timeout) {
    * @param script Script to be evaluated in all pages in the browser context.
    * @since v1.8
    */
-  void addInitScript(Path script);
+  AutoCloseable addInitScript(Path script);
   /**
    * @deprecated Background pages have been removed from Chromium together with Manifest V2 extensions.
    *
@@ -730,54 +815,7 @@ default List<Cookie> cookies() {
    * @param callback Callback function that will be called in the Playwright's context.
    * @since v1.8
    */
-  default void exposeBinding(String name, BindingCallback callback) {
-    exposeBinding(name, callback, null);
-  }
-  /**
-   * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context.
-   * When called, the function executes {@code callback} and returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a> which
-   * resolves to the return value of {@code callback}. If the {@code callback} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, it will be
-   * awaited.
-   *
-   * <p> The first argument of the {@code callback} function contains information about the caller: {@code { browserContext:
-   * BrowserContext, page: Page, frame: Frame }}.
-   *
-   * <p> See {@link com.microsoft.playwright.Page#exposeBinding Page.exposeBinding()} for page-only version.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> An example of exposing page URL to all frames in all pages in the context:
-   * <pre>{@code
-   * import com.microsoft.playwright.*;
-   *
-   * public class Example {
-   *   public static void main(String[] args) {
-   *     try (Playwright playwright = Playwright.create()) {
-   *       BrowserType webkit = playwright.webkit();
-   *       Browser browser = webkit.launch(new BrowserType.LaunchOptions().setHeadless(false));
-   *       BrowserContext context = browser.newContext();
-   *       context.exposeBinding("pageURL", (source, args) -> source.page().url());
-   *       Page page = context.newPage();
-   *       page.setContent("<script>\n" +
-   *         "  async function onClick() {\n" +
-   *         "    document.querySelector('div').textContent = await window.pageURL();\n" +
-   *         "  }\n" +
-   *         "</script>\n" +
-   *         "<button onclick=\"onClick()\">Click me</button>\n" +
-   *         "<div></div>");
-   *       page.getByRole(AriaRole.BUTTON).click();
-   *     }
-   *   }
-   * }
-   * }</pre>
-   *
-   * @param name Name of the function on the window object.
-   * @param callback Callback function that will be called in the Playwright's context.
-   * @since v1.8
-   */
-  void exposeBinding(String name, BindingCallback callback, ExposeBindingOptions options);
+  AutoCloseable exposeBinding(String name, BindingCallback callback);
   /**
    * The method adds a function called {@code name} on the {@code window} object of every frame in every page in the context.
    * When called, the function executes {@code callback} and returns a <a
@@ -836,7 +874,7 @@ default void exposeBinding(String name, BindingCallback callback) {
    * @param callback Callback function that will be called in the Playwright's context.
    * @since v1.8
    */
-  void exposeFunction(String name, FunctionCallback callback);
+  AutoCloseable exposeFunction(String name, FunctionCallback callback);
   /**
    * Grants specified permissions to the browser context. Only grants corresponding permissions to the given origin if
    * specified.
@@ -856,6 +894,8 @@ default void exposeBinding(String name, BindingCallback callback) {
    * <li> {@code "clipboard-write"}</li>
    * <li> {@code "geolocation"}</li>
    * <li> {@code "gyroscope"}</li>
+   * <li> {@code "local-fonts"}</li>
+   * <li> {@code "local-network-access"}</li>
    * <li> {@code "magnetometer"}</li>
    * <li> {@code "microphone"}</li>
    * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
@@ -863,7 +903,7 @@ default void exposeBinding(String name, BindingCallback callback) {
    * <li> {@code "notifications"}</li>
    * <li> {@code "payment-handler"}</li>
    * <li> {@code "storage-access"}</li>
-   * <li> {@code "local-fonts"}</li>
+   * <li> {@code "screen-wake-lock"}</li>
    * </ul>
    * @since v1.8
    */
@@ -889,6 +929,8 @@ default void grantPermissions(List<String> permissions) {
    * <li> {@code "clipboard-write"}</li>
    * <li> {@code "geolocation"}</li>
    * <li> {@code "gyroscope"}</li>
+   * <li> {@code "local-fonts"}</li>
+   * <li> {@code "local-network-access"}</li>
    * <li> {@code "magnetometer"}</li>
    * <li> {@code "microphone"}</li>
    * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
@@ -896,11 +938,17 @@ default void grantPermissions(List<String> permissions) {
    * <li> {@code "notifications"}</li>
    * <li> {@code "payment-handler"}</li>
    * <li> {@code "storage-access"}</li>
-   * <li> {@code "local-fonts"}</li>
+   * <li> {@code "screen-wake-lock"}</li>
    * </ul>
    * @since v1.8
    */
   void grantPermissions(List<String> permissions, GrantPermissionsOptions options);
+  /**
+   * Indicates that the browser context is in the process of closing or has already been closed.
+   *
+   * @since v1.59
+   */
+  boolean isClosed();
   /**
    * <strong>NOTE:</strong> CDP sessions are only supported on Chromium-based browsers.
    *
@@ -992,8 +1040,8 @@ default void grantPermissions(List<String> permissions) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  default void route(String url, Consumer<Route> handler) {
-    route(url, handler, null);
+  default AutoCloseable route(String url, Consumer<Route> handler) {
+    return route(url, handler, null);
   }
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
@@ -1048,7 +1096,7 @@ default void route(String url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  void route(String url, Consumer<Route> handler, RouteOptions options);
+  AutoCloseable route(String url, Consumer<Route> handler, RouteOptions options);
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
@@ -1102,8 +1150,8 @@ default void route(String url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  default void route(Pattern url, Consumer<Route> handler) {
-    route(url, handler, null);
+  default AutoCloseable route(Pattern url, Consumer<Route> handler) {
+    return route(url, handler, null);
   }
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
@@ -1158,7 +1206,7 @@ default void route(Pattern url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  void route(Pattern url, Consumer<Route> handler, RouteOptions options);
+  AutoCloseable route(Pattern url, Consumer<Route> handler, RouteOptions options);
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
    * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
@@ -1212,8 +1260,8 @@ default void route(Pattern url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  default void route(Predicate<String> url, Consumer<Route> handler) {
-    route(url, handler, null);
+  default AutoCloseable route(Predicate<String> url, Consumer<Route> handler) {
+    return route(url, handler, null);
   }
   /**
    * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
@@ -1268,7 +1316,7 @@ default void route(Predicate<String> url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options);
+  AutoCloseable route(Predicate<String> url, Consumer<Route> handler, RouteOptions options);
   /**
    * If specified the network requests that are made in the context will be served from the HAR file. Read more about <a
    * href="https://playwright.dev/java/docs/mock#replaying-from-har">Replaying from HAR</a>.
@@ -1444,7 +1492,8 @@ default void routeFromHAR(Path har) {
    */
   void setOffline(boolean offline);
   /**
-   * Returns storage state for this browser context, contains current cookies, local storage snapshot and IndexedDB snapshot.
+   * Returns storage state for this browser context, contains current cookies, local storage snapshot, IndexedDB snapshot and
+   * virtual WebAuthn credentials.
    *
    * @since v1.8
    */
@@ -1452,11 +1501,30 @@ default String storageState() {
     return storageState(null);
   }
   /**
-   * Returns storage state for this browser context, contains current cookies, local storage snapshot and IndexedDB snapshot.
+   * Returns storage state for this browser context, contains current cookies, local storage snapshot, IndexedDB snapshot and
+   * virtual WebAuthn credentials.
    *
    * @since v1.8
    */
   String storageState(StorageStateOptions options);
+  /**
+   * Clears the existing cookies, local storage, IndexedDB entries and virtual WebAuthn credentials, and sets the new storage
+   * state. When the storage state contains credentials, the virtual WebAuthn authenticator is installed (equivalent to
+   * {@link com.microsoft.playwright.Credentials#install Credentials.install()}), preventing all real authenticators from
+   * working in this context.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * // Load storage state from a file and apply it to the context.
+   * context.setStorageState(Paths.get("state.json"));
+   * }</pre>
+   *
+   * @param storageState Populates context with given storage state. This option can be used to initialize context with logged-in information
+   * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
+   * file with saved storage state.
+   * @since v1.59
+   */
+  void setStorageState(Path storageState);
   /**
    *
    *
@@ -1474,7 +1542,7 @@ default String storageState() {
    * Removes a route created with {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()}. When {@code
    * handler} is not specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] used to register a routing with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}.
    * @since v1.8
    */
@@ -1485,7 +1553,7 @@ default void unroute(String url) {
    * Removes a route created with {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()}. When {@code
    * handler} is not specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] used to register a routing with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}.
    * @param handler Optional handler function used to register a routing with {@link com.microsoft.playwright.BrowserContext#route
    * BrowserContext.route()}.
@@ -1496,7 +1564,7 @@ default void unroute(String url) {
    * Removes a route created with {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()}. When {@code
    * handler} is not specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] used to register a routing with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}.
    * @since v1.8
    */
@@ -1507,7 +1575,7 @@ default void unroute(Pattern url) {
    * Removes a route created with {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()}. When {@code
    * handler} is not specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] used to register a routing with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}.
    * @param handler Optional handler function used to register a routing with {@link com.microsoft.playwright.BrowserContext#route
    * BrowserContext.route()}.
@@ -1518,7 +1586,7 @@ default void unroute(Pattern url) {
    * Removes a route created with {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()}. When {@code
    * handler} is not specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] used to register a routing with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}.
    * @since v1.8
    */
@@ -1529,7 +1597,7 @@ default void unroute(Predicate<String> url) {
    * Removes a route created with {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()}. When {@code
    * handler} is not specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with {@link
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] used to register a routing with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}.
    * @param handler Optional handler function used to register a routing with {@link com.microsoft.playwright.BrowserContext#route
    * BrowserContext.route()}.
diff --git a/playwright/src/main/java/com/microsoft/playwright/BrowserType.java b/playwright/src/main/java/com/microsoft/playwright/BrowserType.java
index 54864b3b0..305dd7fc5 100644
--- a/playwright/src/main/java/com/microsoft/playwright/BrowserType.java
+++ b/playwright/src/main/java/com/microsoft/playwright/BrowserType.java
@@ -124,10 +124,28 @@ public ConnectOptions setTimeout(double timeout) {
     }
   }
   class ConnectOverCDPOptions {
+    /**
+     * If specified, browser artifacts (such as traces and downloads) are saved into this directory.
+     */
+    public Path artifactsDir;
     /**
      * Additional HTTP headers to be sent with connect request. Optional.
      */
     public Map<String, String> headers;
+    /**
+     * Tells Playwright that it runs on the same host as the CDP server. It will enable certain optimizations that rely upon
+     * the file system being the same between Playwright and the Browser.
+     */
+    public Boolean isLocal;
+    /**
+     * When true, Playwright will not apply its default overrides to the existing default browser context. Specifically, {@code
+     * acceptDownloads} is left at the browser's setting, focus emulation is not enabled, and media emulation options (such as
+     * {@code colorScheme}, {@code reducedMotion}, {@code forcedColors}, and {@code contrast}) are not applied. Useful when
+     * attaching to a user's daily-driver browser where these overrides would interfere with existing browser state. New
+     * contexts created via {@link com.microsoft.playwright.Browser#newContext Browser.newContext()} are not affected. Defaults
+     * to {@code false}.
+     */
+    public Boolean noDefaults;
     /**
      * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going on.
      * Defaults to 0.
@@ -139,6 +157,13 @@ class ConnectOverCDPOptions {
      */
     public Double timeout;
 
+    /**
+     * If specified, browser artifacts (such as traces and downloads) are saved into this directory.
+     */
+    public ConnectOverCDPOptions setArtifactsDir(Path artifactsDir) {
+      this.artifactsDir = artifactsDir;
+      return this;
+    }
     /**
      * Additional HTTP headers to be sent with connect request. Optional.
      */
@@ -146,6 +171,26 @@ public ConnectOverCDPOptions setHeaders(Map<String, String> headers) {
       this.headers = headers;
       return this;
     }
+    /**
+     * Tells Playwright that it runs on the same host as the CDP server. It will enable certain optimizations that rely upon
+     * the file system being the same between Playwright and the Browser.
+     */
+    public ConnectOverCDPOptions setIsLocal(boolean isLocal) {
+      this.isLocal = isLocal;
+      return this;
+    }
+    /**
+     * When true, Playwright will not apply its default overrides to the existing default browser context. Specifically, {@code
+     * acceptDownloads} is left at the browser's setting, focus emulation is not enabled, and media emulation options (such as
+     * {@code colorScheme}, {@code reducedMotion}, {@code forcedColors}, and {@code contrast}) are not applied. Useful when
+     * attaching to a user's daily-driver browser where these overrides would interfere with existing browser state. New
+     * contexts created via {@link com.microsoft.playwright.Browser#newContext Browser.newContext()} are not affected. Defaults
+     * to {@code false}.
+     */
+    public ConnectOverCDPOptions setNoDefaults(boolean noDefaults) {
+      this.noDefaults = noDefaults;
+      return this;
+    }
     /**
      * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going on.
      * Defaults to 0.
@@ -171,6 +216,12 @@ class LaunchOptions {
      * href="https://peter.sh/experiments/chromium-command-line-switches/">here</a>.
      */
     public List<String> args;
+    /**
+     * If specified, artifacts (traces, videos, downloads, HAR files, etc.) are saved into this directory. The directory is not
+     * cleaned up when the browser closes. If not specified, a temporary directory is used and cleaned up when the browser
+     * closes.
+     */
+    public Path artifactsDir;
     /**
      * Browser distribution channel.
      *
@@ -186,10 +237,6 @@ class LaunchOptions {
      * Enable Chromium sandboxing. Defaults to {@code false}.
      */
     public Boolean chromiumSandbox;
-    /**
-     * @deprecated Use <a href="https://playwright.dev/java/docs/debug">debugging tools</a> instead.
-     */
-    public Boolean devtools;
     /**
      * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
      * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -229,8 +276,7 @@ class LaunchOptions {
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true} unless
-     * the {@code devtools} option is {@code true}.
+     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
      */
     public Boolean headless;
     /**
@@ -271,6 +317,15 @@ public LaunchOptions setArgs(List<String> args) {
       this.args = args;
       return this;
     }
+    /**
+     * If specified, artifacts (traces, videos, downloads, HAR files, etc.) are saved into this directory. The directory is not
+     * cleaned up when the browser closes. If not specified, a temporary directory is used and cleaned up when the browser
+     * closes.
+     */
+    public LaunchOptions setArtifactsDir(Path artifactsDir) {
+      this.artifactsDir = artifactsDir;
+      return this;
+    }
     @Deprecated
     /**
      * Browser distribution channel.
@@ -307,13 +362,6 @@ public LaunchOptions setChromiumSandbox(boolean chromiumSandbox) {
       this.chromiumSandbox = chromiumSandbox;
       return this;
     }
-    /**
-     * @deprecated Use <a href="https://playwright.dev/java/docs/debug">debugging tools</a> instead.
-     */
-    public LaunchOptions setDevtools(boolean devtools) {
-      this.devtools = devtools;
-      return this;
-    }
     /**
      * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
      * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -374,8 +422,7 @@ public LaunchOptions setHandleSIGTERM(boolean handleSIGTERM) {
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true} unless
-     * the {@code devtools} option is {@code true}.
+     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
      */
     public LaunchOptions setHeadless(boolean headless) {
       this.headless = headless;
@@ -445,6 +492,12 @@ class LaunchPersistentContextOptions {
      * href="https://peter.sh/experiments/chromium-command-line-switches/">here</a>.
      */
     public List<String> args;
+    /**
+     * If specified, artifacts (traces, videos, downloads, HAR files, etc.) are saved into this directory. The directory is not
+     * cleaned up when the browser closes. If not specified, a temporary directory is used and cleaned up when the browser
+     * closes.
+     */
+    public Path artifactsDir;
     /**
      * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
      * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
@@ -518,10 +571,6 @@ class LaunchPersistentContextOptions {
      * href="https://playwright.dev/java/docs/emulation#devices">emulating devices with device scale factor</a>.
      */
     public Double deviceScaleFactor;
-    /**
-     * @deprecated Use <a href="https://playwright.dev/java/docs/debug">debugging tools</a> instead.
-     */
-    public Boolean devtools;
     /**
      * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
      * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -577,8 +626,7 @@ class LaunchPersistentContextOptions {
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true} unless
-     * the {@code devtools} option is {@code true}.
+     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
      */
     public Boolean headless;
     /**
@@ -744,6 +792,15 @@ public LaunchPersistentContextOptions setArgs(List<String> args) {
       this.args = args;
       return this;
     }
+    /**
+     * If specified, artifacts (traces, videos, downloads, HAR files, etc.) are saved into this directory. The directory is not
+     * cleaned up when the browser closes. If not specified, a temporary directory is used and cleaned up when the browser
+     * closes.
+     */
+    public LaunchPersistentContextOptions setArtifactsDir(Path artifactsDir) {
+      this.artifactsDir = artifactsDir;
+      return this;
+    }
     /**
      * When using {@link com.microsoft.playwright.Page#navigate Page.navigate()}, {@link com.microsoft.playwright.Page#route
      * Page.route()}, {@link com.microsoft.playwright.Page#waitForURL Page.waitForURL()}, {@link
@@ -856,13 +913,6 @@ public LaunchPersistentContextOptions setDeviceScaleFactor(double deviceScaleFac
       this.deviceScaleFactor = deviceScaleFactor;
       return this;
     }
-    /**
-     * @deprecated Use <a href="https://playwright.dev/java/docs/debug">debugging tools</a> instead.
-     */
-    public LaunchPersistentContextOptions setDevtools(boolean devtools) {
-      this.devtools = devtools;
-      return this;
-    }
     /**
      * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and is
      * deleted when browser is closed. In either case, the downloads are deleted when the browser context they were created in
@@ -954,8 +1004,7 @@ public LaunchPersistentContextOptions setHasTouch(boolean hasTouch) {
     /**
      * Whether to run browser in headless mode. More details for <a
      * href="https://developers.google.com/web/updates/2017/04/headless-chrome">Chromium</a> and <a
-     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true} unless
-     * the {@code devtools} option is {@code true}.
+     * href="https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/">Firefox</a>. Defaults to {@code true}.
      */
     public LaunchPersistentContextOptions setHeadless(boolean headless) {
       this.headless = headless;
@@ -1237,11 +1286,11 @@ public LaunchPersistentContextOptions setViewportSize(ViewportSize viewportSize)
    * <p> <strong>NOTE:</strong> The major and minor version of the Playwright instance that connects needs to match the version of Playwright that
    * launches the browser (1.2.3 → is compatible with 1.2.x).
    *
-   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via {@code BrowserServer.wsEndpoint}.
+   * @param endpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via {@code BrowserServer.wsEndpoint}.
    * @since v1.8
    */
-  default Browser connect(String wsEndpoint) {
-    return connect(wsEndpoint, null);
+  default Browser connect(String endpoint) {
+    return connect(endpoint, null);
   }
   /**
    * This method attaches Playwright to an existing browser instance created via {@code BrowserType.launchServer} in Node.js.
@@ -1249,10 +1298,10 @@ default Browser connect(String wsEndpoint) {
    * <p> <strong>NOTE:</strong> The major and minor version of the Playwright instance that connects needs to match the version of Playwright that
    * launches the browser (1.2.3 → is compatible with 1.2.x).
    *
-   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via {@code BrowserServer.wsEndpoint}.
+   * @param endpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via {@code BrowserServer.wsEndpoint}.
    * @since v1.8
    */
-  Browser connect(String wsEndpoint, ConnectOptions options);
+  Browser connect(String endpoint, ConnectOptions options);
   /**
    * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
    *
@@ -1265,6 +1314,9 @@ default Browser connect(String wsEndpoint) {
    * advanced functionality, you probably want to use {@link com.microsoft.playwright.BrowserType#connect
    * BrowserType.connect()}.
    *
+   * <p> <strong>NOTE:</strong> Playwright maintains a curated list of arguments for launching the browser. If you launch the browser without Playwright
+   * and do not pass the exact same arguments, some of Playwright functionality may be broken upon connecting to the browser.
+   *
    * <p> <strong>Usage</strong>
    * <pre>{@code
    * Browser browser = playwright.chromium().connectOverCDP("http://localhost:9222");
@@ -1291,6 +1343,9 @@ default Browser connectOverCDP(String endpointURL) {
    * advanced functionality, you probably want to use {@link com.microsoft.playwright.BrowserType#connect
    * BrowserType.connect()}.
    *
+   * <p> <strong>NOTE:</strong> Playwright maintains a curated list of arguments for launching the browser. If you launch the browser without Playwright
+   * and do not pass the exact same arguments, some of Playwright functionality may be broken upon connecting to the browser.
+   *
    * <p> <strong>Usage</strong>
    * <pre>{@code
    * Browser browser = playwright.chromium().connectOverCDP("http://localhost:9222");
diff --git a/playwright/src/main/java/com/microsoft/playwright/CDPSession.java b/playwright/src/main/java/com/microsoft/playwright/CDPSession.java
index eb14c7e8b..1c137a4a2 100644
--- a/playwright/src/main/java/com/microsoft/playwright/CDPSession.java
+++ b/playwright/src/main/java/com/microsoft/playwright/CDPSession.java
@@ -48,6 +48,16 @@
  * }</pre>
  */
 public interface CDPSession {
+
+  /**
+   * Emitted when the session is closed, either because the target was closed or {@code session.detach()} was called.
+   */
+  void onClose(Consumer<CDPSession> handler);
+  /**
+   * Removes handler that was previously added with {@link #onClose onClose(handler)}.
+   */
+  void offClose(Consumer<CDPSession> handler);
+
   /**
    * Detaches the CDPSession from the target. Once detached, the CDPSession object won't emit any events and can't be used to
    * send messages.
diff --git a/playwright/src/main/java/com/microsoft/playwright/CLI.java b/playwright/src/main/java/com/microsoft/playwright/CLI.java
index 21951bd04..b44febf0b 100644
--- a/playwright/src/main/java/com/microsoft/playwright/CLI.java
+++ b/playwright/src/main/java/com/microsoft/playwright/CLI.java
@@ -17,9 +17,12 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.impl.driver.Driver;
+import com.microsoft.playwright.impl.driver.jar.DriverJar;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collections;
 
 import static java.util.Arrays.asList;
@@ -28,7 +31,13 @@
  * Use this class to launch playwright cli.
  */
 public class CLI {
-  public static void main(String[] args) throws IOException, InterruptedException {
+  public static void main(String[] args) throws IOException, InterruptedException, URISyntaxException {
+    // Extract the driver into a fixed directory instead of running the playwright CLI. This is
+    // handled in Java because it must not require an already-extracted driver. See issue #1268.
+    if (args.length > 0 && "install-driver".equals(args[0])) {
+      installDriver(args);
+      return;
+    }
     Driver driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
     ProcessBuilder pb = driver.createProcessBuilder();
     pb.command().addAll(asList(args));
@@ -40,4 +49,17 @@ public static void main(String[] args) throws IOException, InterruptedException
     Process process = pb.start();
     System.exit(process.waitFor());
   }
+
+  private static void installDriver(String[] args) throws IOException, URISyntaxException {
+    String dir = args.length > 1 ? args[1] : System.getenv(Driver.PLAYWRIGHT_DRIVER_DIR);
+    if (dir == null) {
+      System.err.println("Usage: install-driver <dir> (or set the " + Driver.PLAYWRIGHT_DRIVER_DIR
+        + " environment variable)");
+      System.exit(1);
+      return;
+    }
+    Path driverDir = Paths.get(dir);
+    DriverJar.installDriverTo(driverDir);
+    System.out.println("Installed Playwright driver into " + driverDir.toAbsolutePath());
+  }
 }
diff --git a/playwright/src/main/java/com/microsoft/playwright/ConsoleMessage.java b/playwright/src/main/java/com/microsoft/playwright/ConsoleMessage.java
index 663092f3c..db548f8be 100644
--- a/playwright/src/main/java/com/microsoft/playwright/ConsoleMessage.java
+++ b/playwright/src/main/java/com/microsoft/playwright/ConsoleMessage.java
@@ -69,6 +69,12 @@ public interface ConsoleMessage {
    * @since v1.8
    */
   String text();
+  /**
+   * The timestamp of the console message in milliseconds since the Unix epoch.
+   *
+   * @since v1.59
+   */
+  double timestamp();
   /**
    * One of the following values: {@code "log"}, {@code "debug"}, {@code "info"}, {@code "error"}, {@code "warning"}, {@code
    * "dir"}, {@code "dirxml"}, {@code "table"}, {@code "trace"}, {@code "clear"}, {@code "startGroup"}, {@code
@@ -78,5 +84,12 @@ public interface ConsoleMessage {
    * @since v1.8
    */
   String type();
+  /**
+   * The web worker or service worker that produced this console message, if any. Note that console messages from web workers
+   * also have non-null {@link com.microsoft.playwright.ConsoleMessage#page ConsoleMessage.page()}.
+   *
+   * @since v1.57
+   */
+  Worker worker();
 }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/Credentials.java b/playwright/src/main/java/com/microsoft/playwright/Credentials.java
new file mode 100644
index 000000000..5c3eb6d40
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/Credentials.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.*;
+import java.util.*;
+
+/**
+ * {@code Credentials} is a virtual WebAuthn authenticator scoped to a {@code BrowserContext}. It lets tests register
+ * passkeys and answer {@code navigator.credentials.create()} / {@code navigator.credentials.get()} ceremonies in the page,
+ * without a real authenticator or hardware security key.
+ *
+ * <p> There are three common ways to use it:
+ *
+ * <p> <strong>Usage: seed a known credential</strong>
+ * <pre>{@code
+ * BrowserContext context = browser.newContext();
+ *
+ * // A passkey your backend already provisioned for a test user.
+ * context.credentials().create("example.com", new Credentials.CreateOptions()
+ *     .setId(knownCredentialId) // base64url
+ *     .setUserHandle(knownUserHandle) // base64url
+ *     .setPrivateKey(knownPrivateKey) // base64url PKCS#8 (DER)
+ *     .setPublicKey(knownPublicKey)); // base64url SPKI (DER)
+ * context.credentials().install();
+ *
+ * Page page = context.newPage();
+ * page.navigate("https://example.com/login");
+ * // The page's navigator.credentials.get() is answered with the seeded passkey.
+ * }</pre>
+ *
+ * <p> <strong>Usage: capture a credential, then reuse it</strong>
+ * <pre>{@code
+ * // setup test: let the app register a passkey, then save it.
+ * BrowserContext context = browser.newContext();
+ * context.credentials().install();
+ *
+ * Page page = context.newPage();
+ * page.navigate("https://example.com/register");
+ * page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Create a passkey")).click();
+ *
+ * // Read back the passkey the page registered — it includes the private key.
+ * VirtualCredential credential = context.credentials().get(
+ *     new Credentials.GetOptions().setRpId("example.com")).get(0);
+ * Files.writeString(Paths.get("playwright/.auth/passkey.json"), new Gson().toJson(credential));
+ * }</pre>
+ * <pre>{@code
+ * // later test: seed the captured passkey so the app starts already enrolled.
+ * VirtualCredential credential = new Gson().fromJson(
+ *     Files.readString(Paths.get("playwright/.auth/passkey.json")), VirtualCredential.class);
+ * BrowserContext context = browser.newContext();
+ * context.credentials().create(credential.rpId, new Credentials.CreateOptions()
+ *     .setId(credential.id)
+ *     .setUserHandle(credential.userHandle)
+ *     .setPrivateKey(credential.privateKey)
+ *     .setPublicKey(credential.publicKey));
+ * context.credentials().install();
+ *
+ * Page page = context.newPage();
+ * page.navigate("https://example.com/login");
+ * // navigator.credentials.get() resolves the captured passkey — already signed in.
+ * }</pre>
+ *
+ * <p> <strong>Usage: save credentials in the storage state, restore later</strong>
+ *
+ * <p> See <a href="https://playwright.dev/java/docs/auth">authentication guide</a> for examples of using saving and resotring
+ * the storage state.
+ *
+ * <p> <strong>Defaults</strong>
+ */
+public interface Credentials {
+  class CreateOptions {
+    /**
+     * Base64url-encoded credential id. Auto-generated if omitted.
+     */
+    public String id;
+    /**
+     * Base64url-encoded PKCS#8 (DER) private key. Auto-generated if omitted.
+     */
+    public String privateKey;
+    /**
+     * Base64url-encoded SPKI (DER) public key. Auto-generated if omitted.
+     */
+    public String publicKey;
+    /**
+     * Base64url-encoded user handle. Auto-generated if omitted.
+     */
+    public String userHandle;
+
+    /**
+     * Base64url-encoded credential id. Auto-generated if omitted.
+     */
+    public CreateOptions setId(String id) {
+      this.id = id;
+      return this;
+    }
+    /**
+     * Base64url-encoded PKCS#8 (DER) private key. Auto-generated if omitted.
+     */
+    public CreateOptions setPrivateKey(String privateKey) {
+      this.privateKey = privateKey;
+      return this;
+    }
+    /**
+     * Base64url-encoded SPKI (DER) public key. Auto-generated if omitted.
+     */
+    public CreateOptions setPublicKey(String publicKey) {
+      this.publicKey = publicKey;
+      return this;
+    }
+    /**
+     * Base64url-encoded user handle. Auto-generated if omitted.
+     */
+    public CreateOptions setUserHandle(String userHandle) {
+      this.userHandle = userHandle;
+      return this;
+    }
+  }
+  class GetOptions {
+    /**
+     * Only return the credential with this base64url-encoded id.
+     */
+    public String id;
+    /**
+     * Only return credentials for this relying party id.
+     */
+    public String rpId;
+
+    /**
+     * Only return the credential with this base64url-encoded id.
+     */
+    public GetOptions setId(String id) {
+      this.id = id;
+      return this;
+    }
+    /**
+     * Only return credentials for this relying party id.
+     */
+    public GetOptions setRpId(String rpId) {
+      this.rpId = rpId;
+      return this;
+    }
+  }
+  /**
+   * Installs the virtual WebAuthn authenticator into the context, overriding {@code navigator.credentials.create()} and
+   * {@code navigator.credentials.get()} in all current and future pages. Call this before the page first touches {@code
+   * navigator.credentials}.
+   *
+   * <p> Required: until {@link com.microsoft.playwright.Credentials#install Credentials.install()} is called, no interception is
+   * in place and the page sees the platform's native (or absent) WebAuthn behaviour. Seeding credentials with {@link
+   * com.microsoft.playwright.Credentials#create Credentials.create()} without installing populates the authenticator, but
+   * the page will never see those credentials.
+   *
+   * @since v1.61
+   */
+  void install();
+  /**
+   * Seeds a virtual WebAuthn credential and returns it.
+   *
+   * <p> With only {@code rpId}, generates a fresh **ECDSA P-256** keypair, credential id and user handle. The seeded credential
+   * is discoverable (resident), so the page can resolve it from both username-then-passkey and usernameless passkey flows.
+   * The returned object carries the private and public keys, so it can be persisted to disk and re-seeded in a later test.
+   *
+   * <p> To **import a known credential**, supply all four of {@code id}, {@code userHandle}, {@code privateKey} and {@code
+   * publicKey} together.
+   *
+   * <p> Call {@link com.microsoft.playwright.Credentials#install Credentials.install()} before navigating to a page that uses
+   * WebAuthn.
+   *
+   * @param rpId Relying party id (typically the site's effective domain).
+   * @since v1.61
+   */
+  default VirtualCredential create(String rpId) {
+    return create(rpId, null);
+  }
+  /**
+   * Seeds a virtual WebAuthn credential and returns it.
+   *
+   * <p> With only {@code rpId}, generates a fresh **ECDSA P-256** keypair, credential id and user handle. The seeded credential
+   * is discoverable (resident), so the page can resolve it from both username-then-passkey and usernameless passkey flows.
+   * The returned object carries the private and public keys, so it can be persisted to disk and re-seeded in a later test.
+   *
+   * <p> To **import a known credential**, supply all four of {@code id}, {@code userHandle}, {@code privateKey} and {@code
+   * publicKey} together.
+   *
+   * <p> Call {@link com.microsoft.playwright.Credentials#install Credentials.install()} before navigating to a page that uses
+   * WebAuthn.
+   *
+   * @param rpId Relying party id (typically the site's effective domain).
+   * @since v1.61
+   */
+  VirtualCredential create(String rpId, CreateOptions options);
+  /**
+   * Removes a credential from the authenticator by its id. Works for any credential currently held — both those seeded with
+   * {@link com.microsoft.playwright.Credentials#create Credentials.create()} and those the page registered itself by calling
+   * {@code navigator.credentials.create()}.
+   *
+   * @param id Base64url-encoded credential id.
+   * @since v1.61
+   */
+  void delete(String id);
+  /**
+   * Returns every credential currently held by the authenticator, optionally filtered by {@code rpId} or {@code id}. This
+   * includes both credentials seeded with {@link com.microsoft.playwright.Credentials#create Credentials.create()} and
+   * credentials the page registered itself by calling {@code navigator.credentials.create()}.
+   *
+   * <p> Each returned credential includes its private and public keys, so a passkey the app just registered can be saved and
+   * re-seeded into a later test with {@link com.microsoft.playwright.Credentials#create Credentials.create()} — see the
+   * second example in the class overview.
+   *
+   * @since v1.61
+   */
+  default List<VirtualCredential> get() {
+    return get(null);
+  }
+  /**
+   * Returns every credential currently held by the authenticator, optionally filtered by {@code rpId} or {@code id}. This
+   * includes both credentials seeded with {@link com.microsoft.playwright.Credentials#create Credentials.create()} and
+   * credentials the page registered itself by calling {@code navigator.credentials.create()}.
+   *
+   * <p> Each returned credential includes its private and public keys, so a passkey the app just registered can be saved and
+   * re-seeded into a later test with {@link com.microsoft.playwright.Credentials#create Credentials.create()} — see the
+   * second example in the class overview.
+   *
+   * @since v1.61
+   */
+  List<VirtualCredential> get(GetOptions options);
+}
+
diff --git a/playwright/src/main/java/com/microsoft/playwright/Debugger.java b/playwright/src/main/java/com/microsoft/playwright/Debugger.java
new file mode 100644
index 000000000..9fbe29998
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/Debugger.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.*;
+import java.util.*;
+
+/**
+ * API for controlling the Playwright debugger. The debugger allows pausing script execution and inspecting the page.
+ * Obtain the debugger instance via {@link com.microsoft.playwright.BrowserContext#debugger BrowserContext.debugger()}.
+ */
+public interface Debugger {
+
+  /**
+   * Emitted when the debugger pauses or resumes.
+   */
+  void onPausedStateChanged(Runnable handler);
+  /**
+   * Removes handler that was previously added with {@link #onPausedStateChanged onPausedStateChanged(handler)}.
+   */
+  void offPausedStateChanged(Runnable handler);
+
+  /**
+   * Returns details about the currently paused call. Returns {@code null} if the debugger is not paused.
+   *
+   * @since v1.59
+   */
+  DebuggerPausedDetails pausedDetails();
+  /**
+   * Configures the debugger to pause before the next action is executed.
+   *
+   * <p> Throws if the debugger is already paused. Use {@link com.microsoft.playwright.Debugger#next Debugger.next()} or {@link
+   * com.microsoft.playwright.Debugger#runTo Debugger.runTo()} to step while paused.
+   *
+   * <p> Note that {@link com.microsoft.playwright.Page#pause Page.pause()} is equivalent to a "debugger" statement — it pauses
+   * execution at the call site immediately. On the contrary, {@link com.microsoft.playwright.Debugger#requestPause
+   * Debugger.requestPause()} is equivalent to "pause on next statement" — it configures the debugger to pause before the
+   * next action is executed.
+   *
+   * @since v1.59
+   */
+  void requestPause();
+  /**
+   * Resumes script execution. Throws if the debugger is not paused.
+   *
+   * @since v1.59
+   */
+  void resume();
+  /**
+   * Resumes script execution and pauses again before the next action. Throws if the debugger is not paused.
+   *
+   * @since v1.59
+   */
+  void next();
+  /**
+   * Resumes script execution and pauses when an action originates from the given source location. Throws if the debugger is
+   * not paused.
+   *
+   * @param location The source location to pause at.
+   * @since v1.59
+   */
+  void runTo(Location location);
+}
+
diff --git a/playwright/src/main/java/com/microsoft/playwright/Download.java b/playwright/src/main/java/com/microsoft/playwright/Download.java
index 34aacd7bd..490b32096 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Download.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Download.java
@@ -48,6 +48,9 @@ public interface Download {
   /**
    * Returns a readable stream for a successful download, or throws for a failed/canceled download.
    *
+   * <p> <strong>NOTE:</strong> If you don't need a readable stream, it's usually simpler to read the file from disk after the download completed. See
+   * {@link com.microsoft.playwright.Download#path Download.path()}.
+   *
    * @since v1.8
    */
   InputStream createReadStream();
diff --git a/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java b/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
index cc7720101..9fb77bcfa 100644
--- a/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
+++ b/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
@@ -73,6 +73,13 @@ class CheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -117,6 +124,16 @@ public CheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public CheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -170,6 +187,19 @@ class ClickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public Integer steps;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -244,6 +274,25 @@ public ClickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ClickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public ClickOptions setSteps(int steps) {
+      this.steps = steps;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -293,6 +342,19 @@ class DblclickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public Integer steps;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -360,6 +422,25 @@ public DblclickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public DblclickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public DblclickOptions setSteps(int steps) {
+      this.steps = steps;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -445,6 +526,13 @@ class HoverOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -498,6 +586,16 @@ public HoverOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public HoverOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -520,18 +618,12 @@ public HoverOptions setTrial(boolean trial) {
   }
   class InputValueOptions {
     /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
-     * methods.
+     * @deprecated This option is ignored. The value is returned immediately.
      */
     public Double timeout;
 
     /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
-     * methods.
+     * @deprecated This option is ignored. The value is returned immediately.
      */
     public InputValueOptions setTimeout(double timeout) {
       this.timeout = timeout;
@@ -622,7 +714,9 @@ class ScreenshotOptions {
      */
     public Path path;
     /**
-     * The quality of the image, between 0-100. Not applicable to {@code png} images.
+     * The quality of the image, between 0-100. Not applicable to {@code png} images. For {@code jpeg} the default is {@code
+     * 80}. For {@code webp}, a quality of {@code 100} (the default) produces a lossless image, while lower values use lossy
+     * compression.
      */
     public Integer quality;
     /**
@@ -710,7 +804,9 @@ public ScreenshotOptions setPath(Path path) {
       return this;
     }
     /**
-     * The quality of the image, between 0-100. Not applicable to {@code png} images.
+     * The quality of the image, between 0-100. Not applicable to {@code png} images. For {@code jpeg} the default is {@code
+     * 80}. For {@code webp}, a quality of {@code 100} (the default) produces a lossless image, while lower values use lossy
+     * compression.
      */
     public ScreenshotOptions setQuality(int quality) {
       this.quality = quality;
@@ -866,6 +962,13 @@ class SetCheckedOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -910,6 +1013,16 @@ public SetCheckedOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public SetCheckedOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -982,6 +1095,13 @@ class TapOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1035,6 +1155,16 @@ public TapOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public TapOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1112,6 +1242,13 @@ class UncheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1156,6 +1293,16 @@ public UncheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public UncheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
diff --git a/playwright/src/main/java/com/microsoft/playwright/Frame.java b/playwright/src/main/java/com/microsoft/playwright/Frame.java
index 4e6b35c2b..82f6874bd 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Frame.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Frame.java
@@ -165,6 +165,13 @@ class CheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -214,6 +221,16 @@ public CheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public CheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -275,6 +292,13 @@ class ClickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -355,6 +379,16 @@ public ClickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ClickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -413,6 +447,13 @@ class DblclickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -486,6 +527,16 @@ public DblclickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public DblclickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -558,11 +609,23 @@ class DragAndDropOptions {
      * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
      */
     public Position sourcePosition;
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between the {@code mousedown}
+     * and {@code mouseup} of the drag. When set to 1, emits a single {@code mousemove} event at the destination location.
+     */
+    public Integer steps;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -602,6 +665,16 @@ public DragAndDropOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public DragAndDropOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
@@ -617,6 +690,14 @@ public DragAndDropOptions setSourcePosition(Position sourcePosition) {
       this.sourcePosition = sourcePosition;
       return this;
     }
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between the {@code mousedown}
+     * and {@code mouseup} of the drag. When set to 1, emits a single {@code mousemove} event at the destination location.
+     */
+    public DragAndDropOptions setSteps(int steps) {
+      this.steps = steps;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -854,6 +935,13 @@ class GetByRoleOptions {
      * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-checked">{@code aria-checked}</a>.
      */
     public Boolean checked;
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public Object description;
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -862,8 +950,8 @@ class GetByRoleOptions {
      */
     public Boolean disabled;
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public Boolean exact;
     /**
@@ -915,6 +1003,26 @@ public GetByRoleOptions setChecked(boolean checked) {
       this.checked = checked;
       return this;
     }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(String description) {
+      this.description = description;
+      return this;
+    }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(Pattern description) {
+      this.description = description;
+      return this;
+    }
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -926,8 +1034,8 @@ public GetByRoleOptions setDisabled(boolean disabled) {
       return this;
     }
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public GetByRoleOptions setExact(boolean exact) {
       this.exact = exact;
@@ -1116,6 +1224,13 @@ class HoverOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1175,6 +1290,16 @@ public HoverOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public HoverOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1732,6 +1857,13 @@ class SetCheckedOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1781,6 +1913,16 @@ public SetCheckedOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public SetCheckedOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1923,6 +2065,13 @@ class TapOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1982,6 +2131,16 @@ public TapOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public TapOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -2114,6 +2273,13 @@ class UncheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -2163,6 +2329,16 @@ public UncheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public UncheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -2259,7 +2435,7 @@ class WaitForNavigationOptions {
      */
     public Double timeout;
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -2289,7 +2465,7 @@ public WaitForNavigationOptions setTimeout(double timeout) {
       return this;
     }
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -2298,7 +2474,7 @@ public WaitForNavigationOptions setUrl(String url) {
       return this;
     }
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -2307,7 +2483,7 @@ public WaitForNavigationOptions setUrl(Pattern url) {
       return this;
     }
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -2925,7 +3101,7 @@ default Object evalOnSelectorAll(String selector, String expression) {
    * <p> {@code ElementHandle} instances can be passed as an argument to the {@link com.microsoft.playwright.Frame#evaluate
    * Frame.evaluate()}:
    * <pre>{@code
-   * ElementHandle bodyHandle = frame.evaluate("document.body");
+   * ElementHandle bodyHandle = frame.evaluateHandle("document.body");
    * String html = (String) frame.evaluate("([body, suffix]) => body.innerHTML + suffix", Arrays.asList(bodyHandle, "hello"));
    * bodyHandle.dispose();
    * }</pre>
@@ -2965,7 +3141,7 @@ default Object evaluate(String expression) {
    * <p> {@code ElementHandle} instances can be passed as an argument to the {@link com.microsoft.playwright.Frame#evaluate
    * Frame.evaluate()}:
    * <pre>{@code
-   * ElementHandle bodyHandle = frame.evaluate("document.body");
+   * ElementHandle bodyHandle = frame.evaluateHandle("document.body");
    * String html = (String) frame.evaluate("([body, suffix]) => body.innerHTML + suffix", Arrays.asList(bodyHandle, "hello"));
    * bodyHandle.dispose();
    * }</pre>
@@ -3367,7 +3543,7 @@ default Locator getByPlaceholder(Pattern text) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -3410,7 +3586,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -3449,7 +3625,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
@@ -3471,7 +3647,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
@@ -5126,7 +5302,7 @@ default ElementHandle waitForSelector(String selector) {
    * frame.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -5143,7 +5319,7 @@ default void waitForURL(String url) {
    * frame.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -5158,7 +5334,7 @@ default void waitForURL(String url) {
    * frame.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -5175,7 +5351,7 @@ default void waitForURL(Pattern url) {
    * frame.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -5190,7 +5366,7 @@ default void waitForURL(Pattern url) {
    * frame.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -5207,7 +5383,7 @@ default void waitForURL(Predicate<String> url) {
    * frame.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
diff --git a/playwright/src/main/java/com/microsoft/playwright/FrameLocator.java b/playwright/src/main/java/com/microsoft/playwright/FrameLocator.java
index 007460217..ad11d9130 100644
--- a/playwright/src/main/java/com/microsoft/playwright/FrameLocator.java
+++ b/playwright/src/main/java/com/microsoft/playwright/FrameLocator.java
@@ -107,6 +107,13 @@ class GetByRoleOptions {
      * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-checked">{@code aria-checked}</a>.
      */
     public Boolean checked;
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public Object description;
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -115,8 +122,8 @@ class GetByRoleOptions {
      */
     public Boolean disabled;
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public Boolean exact;
     /**
@@ -168,6 +175,26 @@ public GetByRoleOptions setChecked(boolean checked) {
       this.checked = checked;
       return this;
     }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(String description) {
+      this.description = description;
+      return this;
+    }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(Pattern description) {
+      this.description = description;
+      return this;
+    }
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -179,8 +206,8 @@ public GetByRoleOptions setDisabled(boolean disabled) {
       return this;
     }
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public GetByRoleOptions setExact(boolean exact) {
       this.exact = exact;
@@ -602,7 +629,7 @@ default Locator getByPlaceholder(Pattern text) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -645,7 +672,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -684,7 +711,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
@@ -706,7 +733,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
diff --git a/playwright/src/main/java/com/microsoft/playwright/Locator.java b/playwright/src/main/java/com/microsoft/playwright/Locator.java
index 54b494ae3..5b997bac9 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Locator.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Locator.java
@@ -30,6 +30,22 @@
  */
 public interface Locator {
   class AriaSnapshotOptions {
+    /**
+     * When {@code true}, appends each element's bounding box as {@code [box=x,y,width,height]} to the snapshot. Coordinates
+     * are relative to the viewport, in CSS pixels, as returned by <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect">{@code
+     * Element.getBoundingClientRect()}</a>. Defaults to {@code false}.
+     */
+    public Boolean boxes;
+    /**
+     * When specified, limits the depth of the snapshot.
+     */
+    public Integer depth;
+    /**
+     * When set to {@code "ai"}, returns a snapshot optimized for AI consumption. Defaults to {@code "default"}. See details
+     * for more information.
+     */
+    public AriaSnapshotMode mode;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -38,6 +54,31 @@ class AriaSnapshotOptions {
      */
     public Double timeout;
 
+    /**
+     * When {@code true}, appends each element's bounding box as {@code [box=x,y,width,height]} to the snapshot. Coordinates
+     * are relative to the viewport, in CSS pixels, as returned by <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect">{@code
+     * Element.getBoundingClientRect()}</a>. Defaults to {@code false}.
+     */
+    public AriaSnapshotOptions setBoxes(boolean boxes) {
+      this.boxes = boxes;
+      return this;
+    }
+    /**
+     * When specified, limits the depth of the snapshot.
+     */
+    public AriaSnapshotOptions setDepth(int depth) {
+      this.depth = depth;
+      return this;
+    }
+    /**
+     * When set to {@code "ai"}, returns a snapshot optimized for AI consumption. Defaults to {@code "default"}. See details
+     * for more information.
+     */
+    public AriaSnapshotOptions setMode(AriaSnapshotMode mode) {
+      this.mode = mode;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -104,6 +145,13 @@ class CheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -148,6 +196,16 @@ public CheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public CheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -245,6 +303,19 @@ class ClickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public Integer steps;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -320,6 +391,25 @@ public ClickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ClickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public ClickOptions setSteps(int steps) {
+      this.steps = steps;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -370,6 +460,19 @@ class DblclickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public Integer steps;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -438,6 +541,25 @@ public DblclickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public DblclickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
+     */
+    public DblclickOptions setSteps(int steps) {
+      this.steps = steps;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -489,11 +611,23 @@ class DragToOptions {
      * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
      */
     public Position sourcePosition;
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between the {@code mousedown}
+     * and {@code mouseup} of the drag. When set to 1, emits a single {@code mousemove} event at the destination location.
+     */
+    public Integer steps;
     /**
      * Drops on the target element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
@@ -528,6 +662,16 @@ public DragToOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public DragToOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
@@ -543,6 +687,14 @@ public DragToOptions setSourcePosition(Position sourcePosition) {
       this.sourcePosition = sourcePosition;
       return this;
     }
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between the {@code mousedown}
+     * and {@code mouseup} of the drag. When set to 1, emits a single {@code mousemove} event at the destination location.
+     */
+    public DragToOptions setSteps(int steps) {
+      this.steps = steps;
+      return this;
+    }
     /**
      * Drops on the target element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
@@ -578,6 +730,46 @@ public DragToOptions setTrial(boolean trial) {
       return this;
     }
   }
+  class DropOptions {
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of the
+     * element.
+     */
+    public Position position;
+    /**
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
+     * methods.
+     */
+    public Double timeout;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of the
+     * element.
+     */
+    public DropOptions setPosition(double x, double y) {
+      return setPosition(new Position(x, y));
+    }
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of the
+     * element.
+     */
+    public DropOptions setPosition(Position position) {
+      this.position = position;
+      return this;
+    }
+    /**
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
+     * methods.
+     */
+    public DropOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
   class ElementHandleOptions {
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
@@ -876,6 +1068,13 @@ class GetByRoleOptions {
      * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-checked">{@code aria-checked}</a>.
      */
     public Boolean checked;
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public Object description;
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -884,8 +1083,8 @@ class GetByRoleOptions {
      */
     public Boolean disabled;
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public Boolean exact;
     /**
@@ -937,6 +1136,26 @@ public GetByRoleOptions setChecked(boolean checked) {
       this.checked = checked;
       return this;
     }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(String description) {
+      this.description = description;
+      return this;
+    }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(Pattern description) {
+      this.description = description;
+      return this;
+    }
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -948,8 +1167,8 @@ public GetByRoleOptions setDisabled(boolean disabled) {
       return this;
     }
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public GetByRoleOptions setExact(boolean exact) {
       this.exact = exact;
@@ -1055,6 +1274,20 @@ public GetByTitleOptions setExact(boolean exact) {
       return this;
     }
   }
+  class HighlightOptions {
+    /**
+     * Additional inline CSS applied to the highlight overlay, e.g. {@code "outline: 2px dashed red"}.
+     */
+    public String style;
+
+    /**
+     * Additional inline CSS applied to the highlight overlay, e.g. {@code "outline: 2px dashed red"}.
+     */
+    public HighlightOptions setStyle(String style) {
+      this.style = style;
+      return this;
+    }
+  }
   class HoverOptions {
     /**
      * Whether to bypass the <a href="https://playwright.dev/java/docs/actionability">actionability</a> checks. Defaults to
@@ -1076,6 +1309,13 @@ class HoverOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1130,6 +1370,16 @@ public HoverOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public HoverOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1545,7 +1795,9 @@ class ScreenshotOptions {
      */
     public Path path;
     /**
-     * The quality of the image, between 0-100. Not applicable to {@code png} images.
+     * The quality of the image, between 0-100. Not applicable to {@code png} images. For {@code jpeg} the default is {@code
+     * 80}. For {@code webp}, a quality of {@code 100} (the default) produces a lossless image, while lower values use lossy
+     * compression.
      */
     public Integer quality;
     /**
@@ -1633,7 +1885,9 @@ public ScreenshotOptions setPath(Path path) {
       return this;
     }
     /**
-     * The quality of the image, between 0-100. Not applicable to {@code png} images.
+     * The quality of the image, between 0-100. Not applicable to {@code png} images. For {@code jpeg} the default is {@code
+     * 80}. For {@code webp}, a quality of {@code 100} (the default) produces a lossless image, while lower values use lossy
+     * compression.
      */
     public ScreenshotOptions setQuality(int quality) {
       this.quality = quality;
@@ -1789,6 +2043,13 @@ class SetCheckedOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1833,6 +2094,16 @@ public SetCheckedOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public SetCheckedOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1905,6 +2176,13 @@ class TapOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -1959,6 +2237,16 @@ public TapOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public TapOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -2057,6 +2345,13 @@ class UncheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -2101,6 +2396,16 @@ public UncheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public UncheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
      * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
@@ -2168,6 +2473,26 @@ public WaitForOptions setTimeout(double timeout) {
       return this;
     }
   }
+  class WaitForFunctionOptions {
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
+     * methods.
+     */
+    public Double timeout;
+
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
+     * methods.
+     */
+    public WaitForFunctionOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
   /**
    * When the locator points to a list of elements, this returns an array of locators, pointing to their respective elements.
    *
@@ -2194,7 +2519,7 @@ public WaitForOptions setTimeout(double timeout) {
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
-   * String[] texts = page.getByRole(AriaRole.LINK).allInnerTexts();
+   * List<String> texts = page.getByRole(AriaRole.LINK).allInnerTexts();
    * }</pre>
    *
    * @since v1.14
@@ -2209,7 +2534,7 @@ public WaitForOptions setTimeout(double timeout) {
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
-   * String[] texts = page.getByRole(AriaRole.LINK).allTextContents();
+   * List<String> texts = page.getByRole(AriaRole.LINK).allTextContents();
    * }</pre>
    *
    * @since v1.14
@@ -2255,6 +2580,12 @@ public WaitForOptions setTimeout(double timeout) {
    *
    * <p> Below is the HTML markup and the respective ARIA snapshot:
    *
+   * <p> An AI-optimized snapshot, controlled by {@code mode}, is different from a default snapshot:
+   * <ol>
+   * <li> Includes element references {@code [ref=e2]}. 2. Does not wait for an element matching the locator, and throws when no
+   * elements match. 3. Includes snapshots of {@code <iframe>}s inside the target.</li>
+   * </ol>
+   *
    * @since v1.49
    */
   default String ariaSnapshot() {
@@ -2286,6 +2617,12 @@ default String ariaSnapshot() {
    *
    * <p> Below is the HTML markup and the respective ARIA snapshot:
    *
+   * <p> An AI-optimized snapshot, controlled by {@code mode}, is different from a default snapshot:
+   * <ol>
+   * <li> Includes element references {@code [ref=e2]}. 2. Does not wait for an element matching the locator, and throws when no
+   * elements match. 3. Includes snapshots of {@code <iframe>}s inside the target.</li>
+   * </ol>
+   *
    * @since v1.49
    */
   String ariaSnapshot(AriaSnapshotOptions options);
@@ -2616,6 +2953,22 @@ default void dblclick() {
    * @since v1.53
    */
   Locator describe(String description);
+  /**
+   * Returns locator description previously set with {@link com.microsoft.playwright.Locator#describe Locator.describe()}.
+   * Returns {@code null} if no custom description has been set.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator button = page.getByRole(AriaRole.BUTTON).describe("Subscribe button");
+   * System.out.println(button.description()); // "Subscribe button"
+   *
+   * Locator input = page.getByRole(AriaRole.TEXTBOX);
+   * System.out.println(input.description()); // null
+   * }</pre>
+   *
+   * @since v1.57
+   */
+  String description();
   /**
    * Programmatically dispatch an event on the matching element.
    *
@@ -2805,6 +3158,54 @@ default void dragTo(Locator target) {
    * @since v1.18
    */
   void dragTo(Locator target, DragToOptions options);
+  /**
+   * Simulate an external drag-and-drop of files or clipboard-like data onto this locator.
+   *
+   * <p> <strong>Details</strong>
+   *
+   * <p> Dispatches the native {@code dragenter}, {@code dragover}, and {@code drop} events at the center of the target element
+   * with a synthetic [DataTransfer] carrying the provided files and/or data entries. Works cross-browser by constructing the
+   * [DataTransfer] in the page context.
+   *
+   * <p> If the target element's {@code dragover} listener does not call {@code preventDefault()}, the target is considered to
+   * have rejected the drop: Playwright dispatches {@code dragleave} and this method throws.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Drop a file buffer onto an upload area:
+   *
+   * <p> Drop plain text and a URL together:
+   *
+   * @param payload Data to drop onto the target. Provide {@code files} (file paths or in-memory buffers), {@code data} (a mime-type →
+   * string map for clipboard-like content such as {@code text/plain}, {@code text/html}, {@code text/uri-list}), or both.
+   * @since v1.60
+   */
+  default void drop(DropPayload payload) {
+    drop(payload, null);
+  }
+  /**
+   * Simulate an external drag-and-drop of files or clipboard-like data onto this locator.
+   *
+   * <p> <strong>Details</strong>
+   *
+   * <p> Dispatches the native {@code dragenter}, {@code dragover}, and {@code drop} events at the center of the target element
+   * with a synthetic [DataTransfer] carrying the provided files and/or data entries. Works cross-browser by constructing the
+   * [DataTransfer] in the page context.
+   *
+   * <p> If the target element's {@code dragover} listener does not call {@code preventDefault()}, the target is considered to
+   * have rejected the drop: Playwright dispatches {@code dragleave} and this method throws.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Drop a file buffer onto an upload area:
+   *
+   * <p> Drop plain text and a URL together:
+   *
+   * @param payload Data to drop onto the target. Provide {@code files} (file paths or in-memory buffers), {@code data} (a mime-type →
+   * string map for clipboard-like content such as {@code text/plain}, {@code text/html}, {@code text/uri-list}), or both.
+   * @since v1.60
+   */
+  void drop(DropPayload payload, DropOptions options);
   /**
    * Resolves given locator to the first matching DOM element. If there are no matching elements, waits for one. If multiple
    * elements match the locator, throws.
@@ -3433,7 +3834,7 @@ default Locator getByPlaceholder(Pattern text) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -3476,7 +3877,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -3515,7 +3916,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
@@ -3537,7 +3938,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
@@ -3784,13 +4185,28 @@ default Locator getByTitle(Pattern text) {
    * @since v1.27
    */
   Locator getByTitle(Pattern text, GetByTitleOptions options);
+  /**
+   * Hides the element highlight previously added by {@link com.microsoft.playwright.Locator#highlight Locator.highlight()}.
+   *
+   * @since v1.60
+   */
+  void hideHighlight();
+  /**
+   * Highlight the corresponding element(s) on the screen. Useful for debugging, don't commit the code that uses {@link
+   * com.microsoft.playwright.Locator#highlight Locator.highlight()}.
+   *
+   * @since v1.20
+   */
+  default AutoCloseable highlight() {
+    return highlight(null);
+  }
   /**
    * Highlight the corresponding element(s) on the screen. Useful for debugging, don't commit the code that uses {@link
    * com.microsoft.playwright.Locator#highlight Locator.highlight()}.
    *
    * @since v1.20
    */
-  void highlight();
+  AutoCloseable highlight(HighlightOptions options);
   /**
    * Hover over the matching element.
    *
@@ -4186,6 +4602,14 @@ default Locator locator(Locator selectorOrLocator) {
    * @since v1.14
    */
   Locator locator(Locator selectorOrLocator, LocatorOptions options);
+  /**
+   * Returns a new locator that uses best practices for referencing the matched element, prioritizing test ids, aria roles,
+   * and other user-facing attributes over CSS selectors. This is useful for converting implementation-detail selectors into
+   * more resilient, human-readable locators.
+   *
+   * @since v1.59
+   */
+  Locator normalize();
   /**
    * Returns locator to the n-th matching element. It's zero based, {@code nth(0)} selects the first element.
    *
@@ -5432,5 +5856,83 @@ default void waitFor() {
    * @since v1.16
    */
   void waitFor(WaitForOptions options);
+  /**
+   * Returns when {@code expression} returns a truthy value, called with the matching element as a first argument, and {@code
+   * arg} as a second argument.
+   *
+   * <p> This is a generic way to wait for an element to reach a custom condition without asserting it. The locator is
+   * re-resolved on each retry, so it tolerates the element being re-rendered while waiting.
+   *
+   * <p> If {@code expression} returns a <a
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, this method
+   * will wait for the promise to resolve before checking its value.
+   *
+   * <p> If {@code expression} throws or rejects, this method throws.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Wait for an attribute to appear:
+   *
+   * <p> Passing argument to {@code expression}:
+   *
+   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
+   * automatically invoked.
+   * @param arg Optional argument to pass to {@code expression}.
+   * @since v1.62
+   */
+  default void waitForFunction(String expression, Object arg) {
+    waitForFunction(expression, arg, null);
+  }
+  /**
+   * Returns when {@code expression} returns a truthy value, called with the matching element as a first argument, and {@code
+   * arg} as a second argument.
+   *
+   * <p> This is a generic way to wait for an element to reach a custom condition without asserting it. The locator is
+   * re-resolved on each retry, so it tolerates the element being re-rendered while waiting.
+   *
+   * <p> If {@code expression} returns a <a
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, this method
+   * will wait for the promise to resolve before checking its value.
+   *
+   * <p> If {@code expression} throws or rejects, this method throws.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Wait for an attribute to appear:
+   *
+   * <p> Passing argument to {@code expression}:
+   *
+   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
+   * automatically invoked.
+   * @since v1.62
+   */
+  default void waitForFunction(String expression) {
+    waitForFunction(expression, null);
+  }
+  /**
+   * Returns when {@code expression} returns a truthy value, called with the matching element as a first argument, and {@code
+   * arg} as a second argument.
+   *
+   * <p> This is a generic way to wait for an element to reach a custom condition without asserting it. The locator is
+   * re-resolved on each retry, so it tolerates the element being re-rendered while waiting.
+   *
+   * <p> If {@code expression} returns a <a
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, this method
+   * will wait for the promise to resolve before checking its value.
+   *
+   * <p> If {@code expression} throws or rejects, this method throws.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Wait for an attribute to appear:
+   *
+   * <p> Passing argument to {@code expression}:
+   *
+   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
+   * automatically invoked.
+   * @param arg Optional argument to pass to {@code expression}.
+   * @since v1.62
+   */
+  void waitForFunction(String expression, Object arg, WaitForFunctionOptions options);
 }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/Mouse.java b/playwright/src/main/java/com/microsoft/playwright/Mouse.java
index dbb9fb781..1ea0b5e9d 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Mouse.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Mouse.java
@@ -127,12 +127,16 @@ public DownOptions setClickCount(int clickCount) {
   }
   class MoveOptions {
     /**
-     * Defaults to 1. Sends intermediate {@code mousemove} events.
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
      */
     public Integer steps;
 
     /**
-     * Defaults to 1. Sends intermediate {@code mousemove} events.
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
+     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
+     * location.
      */
     public MoveOptions setSteps(int steps) {
       this.steps = steps;
diff --git a/playwright/src/main/java/com/microsoft/playwright/Page.java b/playwright/src/main/java/com/microsoft/playwright/Page.java
index aa2ecd0c4..9d1295c43 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Page.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Page.java
@@ -435,6 +435,13 @@ class CheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -484,6 +491,16 @@ public CheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public CheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -545,6 +562,13 @@ class ClickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -625,6 +649,16 @@ public ClickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ClickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -710,6 +744,13 @@ class DblclickOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -783,6 +824,16 @@ public DblclickOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public DblclickOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -855,11 +906,23 @@ class DragAndDropOptions {
      * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
      */
     public Position sourcePosition;
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between the {@code mousedown}
+     * and {@code mouseup} of the drag. When set to 1, emits a single {@code mousemove} event at the destination location.
+     */
+    public Integer steps;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -899,6 +962,16 @@ public DragAndDropOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public DragAndDropOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
      * specified, some visible point of the element is used.
@@ -914,6 +987,14 @@ public DragAndDropOptions setSourcePosition(Position sourcePosition) {
       this.sourcePosition = sourcePosition;
       return this;
     }
+    /**
+     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between the {@code mousedown}
+     * and {@code mouseup} of the drag. When set to 1, emits a single {@code mousemove} event at the destination location.
+     */
+    public DragAndDropOptions setSteps(int steps) {
+      this.steps = steps;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1045,20 +1126,6 @@ public EvalOnSelectorOptions setStrict(boolean strict) {
       return this;
     }
   }
-  class ExposeBindingOptions {
-    /**
-     * @deprecated This option will be removed in the future.
-     */
-    public Boolean handle;
-
-    /**
-     * @deprecated This option will be removed in the future.
-     */
-    public ExposeBindingOptions setHandle(boolean handle) {
-      this.handle = handle;
-      return this;
-    }
-  }
   class FillOptions {
     /**
      * Whether to bypass the <a href="https://playwright.dev/java/docs/actionability">actionability</a> checks. Defaults to
@@ -1237,6 +1304,13 @@ class GetByRoleOptions {
      * <p> Learn more about <a href="https://www.w3.org/TR/wai-aria-1.2/#aria-checked">{@code aria-checked}</a>.
      */
     public Boolean checked;
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public Object description;
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -1245,8 +1319,8 @@ class GetByRoleOptions {
      */
     public Boolean disabled;
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public Boolean exact;
     /**
@@ -1298,6 +1372,26 @@ public GetByRoleOptions setChecked(boolean checked) {
       this.checked = checked;
       return this;
     }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(String description) {
+      this.description = description;
+      return this;
+    }
+    /**
+     * Option to match the <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>. By
+     * default, matching is case-insensitive and searches for a substring, use {@code exact} to control this behavior.
+     *
+     * <p> Learn more about <a href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+     */
+    public GetByRoleOptions setDescription(Pattern description) {
+      this.description = description;
+      return this;
+    }
     /**
      * An attribute that is usually set by {@code aria-disabled} or {@code disabled}.
      *
@@ -1309,8 +1403,8 @@ public GetByRoleOptions setDisabled(boolean disabled) {
       return this;
     }
     /**
-     * Whether {@code name} is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when {@code name}
-     * is a regular expression. Note that exact match still trims whitespace.
+     * Whether {@code name} and {@code description} are matched exactly: case-sensitive and whole-string. Defaults to false.
+     * Ignored when the value is a regular expression. Note that exact match still trims whitespace.
      */
     public GetByRoleOptions setExact(boolean exact) {
       this.exact = exact;
@@ -1597,6 +1691,13 @@ class HoverOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1656,6 +1757,16 @@ public HoverOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public HoverOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -1974,6 +2085,20 @@ public IsVisibleOptions setTimeout(double timeout) {
       return this;
     }
   }
+  class ConsoleMessagesOptions {
+    /**
+     * Controls which messages are returned:
+     */
+    public ConsoleMessagesFilter filter;
+
+    /**
+     * Controls which messages are returned:
+     */
+    public ConsoleMessagesOptions setFilter(ConsoleMessagesFilter filter) {
+      this.filter = filter;
+      return this;
+    }
+  }
   class LocatorOptions {
     /**
      * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
@@ -2558,7 +2683,9 @@ class ScreenshotOptions {
      */
     public Path path;
     /**
-     * The quality of the image, between 0-100. Not applicable to {@code png} images.
+     * The quality of the image, between 0-100. Not applicable to {@code png} images. For {@code jpeg} the default is {@code
+     * 80}. For {@code webp}, a quality of {@code 100} (the default) produces a lossless image, while lower values use lossy
+     * compression.
      */
     public Integer quality;
     /**
@@ -2667,7 +2794,9 @@ public ScreenshotOptions setPath(Path path) {
       return this;
     }
     /**
-     * The quality of the image, between 0-100. Not applicable to {@code png} images.
+     * The quality of the image, between 0-100. Not applicable to {@code png} images. For {@code jpeg} the default is {@code
+     * 80}. For {@code webp}, a quality of {@code 100} (the default) produces a lossless image, while lower values use lossy
+     * compression.
      */
     public ScreenshotOptions setQuality(int quality) {
       this.quality = quality;
@@ -2783,6 +2912,13 @@ class SetCheckedOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -2832,6 +2968,16 @@ public SetCheckedOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public SetCheckedOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -2953,6 +3099,67 @@ public SetInputFilesOptions setTimeout(double timeout) {
       return this;
     }
   }
+  class AriaSnapshotOptions {
+    /**
+     * When {@code true}, appends each element's bounding box as {@code [box=x,y,width,height]} to the snapshot. Coordinates
+     * are relative to the viewport, in CSS pixels, as returned by <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect">{@code
+     * Element.getBoundingClientRect()}</a>. Defaults to {@code false}.
+     */
+    public Boolean boxes;
+    /**
+     * When specified, limits the depth of the snapshot.
+     */
+    public Integer depth;
+    /**
+     * When set to {@code "ai"}, returns a snapshot optimized for AI consumption: including element references like {@code
+     * [ref=e2]} and snapshots of {@code <iframe>}s. Defaults to {@code "default"}.
+     */
+    public AriaSnapshotMode mode;
+    /**
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
+     * methods.
+     */
+    public Double timeout;
+
+    /**
+     * When {@code true}, appends each element's bounding box as {@code [box=x,y,width,height]} to the snapshot. Coordinates
+     * are relative to the viewport, in CSS pixels, as returned by <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect">{@code
+     * Element.getBoundingClientRect()}</a>. Defaults to {@code false}.
+     */
+    public AriaSnapshotOptions setBoxes(boolean boxes) {
+      this.boxes = boxes;
+      return this;
+    }
+    /**
+     * When specified, limits the depth of the snapshot.
+     */
+    public AriaSnapshotOptions setDepth(int depth) {
+      this.depth = depth;
+      return this;
+    }
+    /**
+     * When set to {@code "ai"}, returns a snapshot optimized for AI consumption: including element references like {@code
+     * [ref=e2]} and snapshots of {@code <iframe>}s. Defaults to {@code "default"}.
+     */
+    public AriaSnapshotOptions setMode(AriaSnapshotMode mode) {
+      this.mode = mode;
+      return this;
+    }
+    /**
+     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
+     * methods.
+     */
+    public AriaSnapshotOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
   class TapOptions {
     /**
      * Whether to bypass the <a href="https://playwright.dev/java/docs/actionability">actionability</a> checks. Defaults to
@@ -2974,6 +3181,13 @@ class TapOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -3033,6 +3247,16 @@ public TapOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public TapOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -3165,6 +3389,13 @@ class UncheckOptions {
      * element.
      */
     public Position position;
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public ScrollMode scroll;
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -3214,6 +3445,16 @@ public UncheckOptions setPosition(Position position) {
       this.position = position;
       return this;
     }
+    /**
+     * Controls whether Playwright scrolls the element into view before performing the action. Defaults to {@code "auto"},
+     * which scrolls the element into view when necessary, including scrolling nested scrollable containers. When set to {@code
+     * "none"}, Playwright does not scroll the element and the action fails if the element is not already in the viewport. This
+     * is useful to assert that an element is reachable by the user without additional scrolling.
+     */
+    public UncheckOptions setScroll(ScrollMode scroll) {
+      this.scroll = scroll;
+      return this;
+    }
     /**
      * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
      * element, the call throws an exception.
@@ -3415,7 +3656,7 @@ class WaitForNavigationOptions {
      */
     public Double timeout;
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -3445,7 +3686,7 @@ public WaitForNavigationOptions setTimeout(double timeout) {
       return this;
     }
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -3454,7 +3695,7 @@ public WaitForNavigationOptions setUrl(String url) {
       return this;
     }
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -3463,7 +3704,7 @@ public WaitForNavigationOptions setUrl(Pattern url) {
       return this;
     }
     /**
-     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+     * A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
      * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
      * the string.
      */
@@ -3799,7 +4040,7 @@ public WaitForWorkerOptions setTimeout(double timeout) {
    * @param script Script to be evaluated in all pages in the browser context.
    * @since v1.8
    */
-  void addInitScript(String script);
+  AutoCloseable addInitScript(String script);
   /**
    * Adds a script which would be evaluated in one of the following scenarios:
    * <ul>
@@ -3826,7 +4067,7 @@ public WaitForWorkerOptions setTimeout(double timeout) {
    * @param script Script to be evaluated in all pages in the browser context.
    * @since v1.8
    */
-  void addInitScript(Path script);
+  AutoCloseable addInitScript(Path script);
   /**
    * Adds a {@code <script>} tag into the page with the desired url or content. Returns the added tag when the script's
    * onload fires or when the script content was injected into frame.
@@ -3867,6 +4108,13 @@ default ElementHandle addStyleTag() {
    * @since v1.8
    */
   void bringToFront();
+  /**
+   * Cancels an ongoing {@link com.microsoft.playwright.Page#pickLocator Page.pickLocator()} call by deactivating pick
+   * locator mode. If no pick locator mode is active, this method is a no-op.
+   *
+   * @since v1.59
+   */
+  void cancelPickLocator();
   /**
    * This method checks an element matching {@code selector} by performing the following steps:
    * <ol>
@@ -4421,7 +4669,7 @@ default Object evalOnSelectorAll(String selector, String expression) {
    * <p> {@code ElementHandle} instances can be passed as an argument to the {@link com.microsoft.playwright.Page#evaluate
    * Page.evaluate()}:
    * <pre>{@code
-   * ElementHandle bodyHandle = page.evaluate("document.body");
+   * ElementHandle bodyHandle = page.evaluateHandle("document.body");
    * String html = (String) page.evaluate("([body, suffix]) => body.innerHTML + suffix", Arrays.asList(bodyHandle, "hello"));
    * bodyHandle.dispose();
    * }</pre>
@@ -4463,7 +4711,7 @@ default Object evaluate(String expression) {
    * <p> {@code ElementHandle} instances can be passed as an argument to the {@link com.microsoft.playwright.Page#evaluate
    * Page.evaluate()}:
    * <pre>{@code
-   * ElementHandle bodyHandle = page.evaluate("document.body");
+   * ElementHandle bodyHandle = page.evaluateHandle("document.body");
    * String html = (String) page.evaluate("([body, suffix]) => body.innerHTML + suffix", Arrays.asList(bodyHandle, "hello"));
    * bodyHandle.dispose();
    * }</pre>
@@ -4598,57 +4846,7 @@ default JSHandle evaluateHandle(String expression) {
    * @param callback Callback function that will be called in the Playwright's context.
    * @since v1.8
    */
-  default void exposeBinding(String name, BindingCallback callback) {
-    exposeBinding(name, callback, null);
-  }
-  /**
-   * The method adds a function called {@code name} on the {@code window} object of every frame in this page. When called,
-   * the function executes {@code callback} and returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a> which
-   * resolves to the return value of {@code callback}. If the {@code callback} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, it will be
-   * awaited.
-   *
-   * <p> The first argument of the {@code callback} function contains information about the caller: {@code { browserContext:
-   * BrowserContext, page: Page, frame: Frame }}.
-   *
-   * <p> See {@link com.microsoft.playwright.BrowserContext#exposeBinding BrowserContext.exposeBinding()} for the context-wide
-   * version.
-   *
-   * <p> <strong>NOTE:</strong> Functions installed via {@link com.microsoft.playwright.Page#exposeBinding Page.exposeBinding()} survive navigations.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> An example of exposing page URL to all frames in a page:
-   * <pre>{@code
-   * import com.microsoft.playwright.*;
-   *
-   * public class Example {
-   *   public static void main(String[] args) {
-   *     try (Playwright playwright = Playwright.create()) {
-   *       BrowserType webkit = playwright.webkit();
-   *       Browser browser = webkit.launch(new BrowserType.LaunchOptions().setHeadless(false));
-   *       BrowserContext context = browser.newContext();
-   *       Page page = context.newPage();
-   *       page.exposeBinding("pageURL", (source, args) -> source.page().url());
-   *       page.setContent("<script>\n" +
-   *         "  async function onClick() {\n" +
-   *         "    document.querySelector('div').textContent = await window.pageURL();\n" +
-   *         "  }\n" +
-   *         "</script>\n" +
-   *         "<button onclick=\"onClick()\">Click me</button>\n" +
-   *         "<div></div>");
-   *       page.click("button");
-   *     }
-   *   }
-   * }
-   * }</pre>
-   *
-   * @param name Name of the function on the window object.
-   * @param callback Callback function that will be called in the Playwright's context.
-   * @since v1.8
-   */
-  void exposeBinding(String name, BindingCallback callback, ExposeBindingOptions options);
+  AutoCloseable exposeBinding(String name, BindingCallback callback);
   /**
    * The method adds a function called {@code name} on the {@code window} object of every frame in the page. When called, the
    * function executes {@code callback} and returns a <a
@@ -4710,7 +4908,7 @@ default void exposeBinding(String name, BindingCallback callback) {
    * @param callback Callback function which will be called in Playwright's context.
    * @since v1.8
    */
-  void exposeFunction(String name, FunctionCallback callback);
+  AutoCloseable exposeFunction(String name, FunctionCallback callback);
   /**
    * This method waits for an element matching {@code selector}, waits for <a
    * href="https://playwright.dev/java/docs/actionability">actionability</a> checks, focuses the element, fills it and
@@ -5049,7 +5247,7 @@ default Locator getByPlaceholder(Pattern text) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -5092,7 +5290,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate each element by it's implicit role:
+   * <p> You can locate each element by its implicit role:
    * <pre>{@code
    * assertThat(page
    *     .getByRole(AriaRole.HEADING,
@@ -5131,7 +5329,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
@@ -5153,7 +5351,7 @@ default Locator getByRole(AriaRole role) {
    *
    * <p> Consider the following DOM structure.
    *
-   * <p> You can locate the element by it's test id:
+   * <p> You can locate the element by its test id:
    * <pre>{@code
    * page.getByTestId("directions").click();
    * }</pre>
@@ -5406,6 +5604,11 @@ default Locator getByTitle(Pattern text) {
    *
    * <p> Navigate to the previous page in history.
    *
+   * <p> <strong>NOTE:</strong> **Testing Back/Forward Cache (BFCache) is not supported.**  By default, Playwright disables the Back/Forward Cache
+   * across all browsers. Even if explicitly enabled, Playwright's internal state relies on network-level navigation events.
+   * Because BFCache restores unfreeze the DOM without firing these events, using {@code page.goBack()} or {@code
+   * page.goForward()} to trigger a BFCache restore will result in timeouts and a desynchronized {@code Page} state.
+   *
    * @since v1.8
    */
   default Response goBack() {
@@ -5417,6 +5620,11 @@ default Response goBack() {
    *
    * <p> Navigate to the previous page in history.
    *
+   * <p> <strong>NOTE:</strong> **Testing Back/Forward Cache (BFCache) is not supported.**  By default, Playwright disables the Back/Forward Cache
+   * across all browsers. Even if explicitly enabled, Playwright's internal state relies on network-level navigation events.
+   * Because BFCache restores unfreeze the DOM without firing these events, using {@code page.goBack()} or {@code
+   * page.goForward()} to trigger a BFCache restore will result in timeouts and a desynchronized {@code Page} state.
+   *
    * @since v1.8
    */
   Response goBack(GoBackOptions options);
@@ -5426,6 +5634,11 @@ default Response goBack() {
    *
    * <p> Navigate to the next page in history.
    *
+   * <p> <strong>NOTE:</strong> **Testing Back/Forward Cache (BFCache) is not supported.**  By default, Playwright disables the Back/Forward Cache
+   * across all browsers. Even if explicitly enabled, Playwright's internal state relies on network-level navigation events.
+   * Because BFCache restores unfreeze the DOM without firing these events, using {@code page.goBack()} or {@code
+   * page.goForward()} to trigger a BFCache restore will result in timeouts and a desynchronized {@code Page} state.
+   *
    * @since v1.8
    */
   default Response goForward() {
@@ -5437,6 +5650,11 @@ default Response goForward() {
    *
    * <p> Navigate to the next page in history.
    *
+   * <p> <strong>NOTE:</strong> **Testing Back/Forward Cache (BFCache) is not supported.**  By default, Playwright disables the Back/Forward Cache
+   * across all browsers. Even if explicitly enabled, Playwright's internal state relies on network-level navigation events.
+   * Because BFCache restores unfreeze the DOM without firing these events, using {@code page.goBack()} or {@code
+   * page.goForward()} to trigger a BFCache restore will result in timeouts and a desynchronized {@code Page} state.
+   *
    * @since v1.8
    */
   Response goForward(GoForwardOptions options);
@@ -5519,6 +5737,13 @@ default Response navigate(String url) {
    * @since v1.8
    */
   Response navigate(String url, NavigateOptions options);
+  /**
+   * Hide all locator highlight overlays previously added by {@link com.microsoft.playwright.Locator#highlight
+   * Locator.highlight()} on this page.
+   *
+   * @since v1.60
+   */
+  void hideHighlight();
   /**
    * This method hovers over an element matching {@code selector} by performing the following steps:
    * <ol>
@@ -5729,13 +5954,48 @@ default boolean isVisible(String selector) {
    * @since v1.8
    */
   Keyboard keyboard();
+  /**
+   * Clears all stored console messages from this page. Subsequent calls to {@link
+   * com.microsoft.playwright.Page#consoleMessages Page.consoleMessages()} will only return messages logged after the clear.
+   *
+   * @since v1.59
+   */
+  void clearConsoleMessages();
+  /**
+   * Clears all stored page errors from this page. Subsequent calls to {@link com.microsoft.playwright.Page#pageErrors
+   * Page.pageErrors()} will only return errors thrown after the clear.
+   *
+   * @since v1.59
+   */
+  void clearPageErrors();
+  /**
+   * Provides access to the page's {@code localStorage} for the current origin. See {@code WebStorage}.
+   *
+   * @since v1.61
+   */
+  WebStorage localStorage();
+  /**
+   * Provides access to the page's {@code sessionStorage} for the current origin. See {@code WebStorage}.
+   *
+   * @since v1.61
+   */
+  WebStorage sessionStorage();
   /**
    * Returns up to (currently) 200 last console messages from this page. See {@link
    * com.microsoft.playwright.Page#onConsoleMessage Page.onConsoleMessage()} for more details.
    *
    * @since v1.56
    */
-  List<ConsoleMessage> consoleMessages();
+  default List<ConsoleMessage> consoleMessages() {
+    return consoleMessages(null);
+  }
+  /**
+   * Returns up to (currently) 200 last console messages from this page. See {@link
+   * com.microsoft.playwright.Page#onConsoleMessage Page.onConsoleMessage()} for more details.
+   *
+   * @since v1.56
+   */
+  List<ConsoleMessage> consoleMessages(ConsoleMessagesOptions options);
   /**
    * Returns up to (currently) 200 last page errors from this page. See {@link com.microsoft.playwright.Page#onPageError
    * Page.onPageError()} for more details.
@@ -5951,6 +6211,19 @@ default byte[] pdf() {
    * @since v1.8
    */
   byte[] pdf(PdfOptions options);
+  /**
+   * Enters pick locator mode where hovering over page elements highlights them and shows the corresponding locator. Once the
+   * user clicks an element, the mode is deactivated and the {@code Locator} for the picked element is returned.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.pickLocator();
+   * System.out.println(locator);
+   * }</pre>
+   *
+   * @since v1.59
+   */
+  Locator pickLocator();
   /**
    * Focuses the element, and then uses {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} and {@link
    * com.microsoft.playwright.Keyboard#up Keyboard.up()}.
@@ -6339,6 +6612,8 @@ default Response reload() {
    * });
    * }</pre>
    *
+   * <p> If a request matches multiple registered routes, the most recently registered route takes precedence.
+   *
    * <p> Page routes take precedence over browser context routes (set up with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}) when request matches both handlers.
    *
@@ -6352,8 +6627,8 @@ default Response reload() {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  default void route(String url, Consumer<Route> handler) {
-    route(url, handler, null);
+  default AutoCloseable route(String url, Consumer<Route> handler) {
+    return route(url, handler, null);
   }
   /**
    * Routing provides the capability to modify network requests that are made by a page.
@@ -6398,6 +6673,8 @@ default void route(String url, Consumer<Route> handler) {
    * });
    * }</pre>
    *
+   * <p> If a request matches multiple registered routes, the most recently registered route takes precedence.
+   *
    * <p> Page routes take precedence over browser context routes (set up with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}) when request matches both handlers.
    *
@@ -6411,7 +6688,7 @@ default void route(String url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  void route(String url, Consumer<Route> handler, RouteOptions options);
+  AutoCloseable route(String url, Consumer<Route> handler, RouteOptions options);
   /**
    * Routing provides the capability to modify network requests that are made by a page.
    *
@@ -6455,6 +6732,8 @@ default void route(String url, Consumer<Route> handler) {
    * });
    * }</pre>
    *
+   * <p> If a request matches multiple registered routes, the most recently registered route takes precedence.
+   *
    * <p> Page routes take precedence over browser context routes (set up with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}) when request matches both handlers.
    *
@@ -6468,8 +6747,8 @@ default void route(String url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  default void route(Pattern url, Consumer<Route> handler) {
-    route(url, handler, null);
+  default AutoCloseable route(Pattern url, Consumer<Route> handler) {
+    return route(url, handler, null);
   }
   /**
    * Routing provides the capability to modify network requests that are made by a page.
@@ -6514,6 +6793,8 @@ default void route(Pattern url, Consumer<Route> handler) {
    * });
    * }</pre>
    *
+   * <p> If a request matches multiple registered routes, the most recently registered route takes precedence.
+   *
    * <p> Page routes take precedence over browser context routes (set up with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}) when request matches both handlers.
    *
@@ -6527,7 +6808,7 @@ default void route(Pattern url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  void route(Pattern url, Consumer<Route> handler, RouteOptions options);
+  AutoCloseable route(Pattern url, Consumer<Route> handler, RouteOptions options);
   /**
    * Routing provides the capability to modify network requests that are made by a page.
    *
@@ -6571,6 +6852,8 @@ default void route(Pattern url, Consumer<Route> handler) {
    * });
    * }</pre>
    *
+   * <p> If a request matches multiple registered routes, the most recently registered route takes precedence.
+   *
    * <p> Page routes take precedence over browser context routes (set up with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}) when request matches both handlers.
    *
@@ -6584,8 +6867,8 @@ default void route(Pattern url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  default void route(Predicate<String> url, Consumer<Route> handler) {
-    route(url, handler, null);
+  default AutoCloseable route(Predicate<String> url, Consumer<Route> handler) {
+    return route(url, handler, null);
   }
   /**
    * Routing provides the capability to modify network requests that are made by a page.
@@ -6630,6 +6913,8 @@ default void route(Predicate<String> url, Consumer<Route> handler) {
    * });
    * }</pre>
    *
+   * <p> If a request matches multiple registered routes, the most recently registered route takes precedence.
+   *
    * <p> Page routes take precedence over browser context routes (set up with {@link
    * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}) when request matches both handlers.
    *
@@ -6643,7 +6928,7 @@ default void route(Predicate<String> url, Consumer<Route> handler) {
    * @param handler handler function to route the request.
    * @since v1.8
    */
-  void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options);
+  AutoCloseable route(Predicate<String> url, Consumer<Route> handler, RouteOptions options);
   /**
    * If specified the network requests that are made in the page will be served from the HAR file. Read more about <a
    * href="https://playwright.dev/java/docs/mock#replaying-from-har">Replaying from HAR</a>.
@@ -6747,6 +7032,14 @@ default void routeFromHAR(Path har) {
    * @since v1.48
    */
   void routeWebSocket(Predicate<String> url, Consumer<WebSocketRoute> handler);
+  /**
+   * {@code Screencast} object associated with this page.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * @since v1.59
+   */
+  Screencast screencast();
   /**
    * Returns the buffer with the captured screenshot.
    *
@@ -7401,6 +7694,22 @@ default void setInputFiles(String selector, FilePayload[] files) {
    * @since v1.8
    */
   void setViewportSize(int width, int height);
+  /**
+   * Captures the aria snapshot of the page. Read more about <a href="https://playwright.dev/java/docs/aria-snapshots">aria
+   * snapshots</a>.
+   *
+   * @since v1.59
+   */
+  default String ariaSnapshot() {
+    return ariaSnapshot(null);
+  }
+  /**
+   * Captures the aria snapshot of the page. Read more about <a href="https://playwright.dev/java/docs/aria-snapshots">aria
+   * snapshots</a>.
+   *
+   * @since v1.59
+   */
+  String ariaSnapshot(AriaSnapshotOptions options);
   /**
    * This method taps an element matching {@code selector} by performing the following steps:
    * <ol>
@@ -7415,8 +7724,8 @@ default void setInputFiles(String selector, FilePayload[] files) {
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
    * TimeoutError}. Passing zero timeout disables this.
    *
-   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser
-   * context is false.
+   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} will throw if the {@code hasTouch} option of the browser context is
+   * false.
    *
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be used.
    * @since v1.8
@@ -7438,8 +7747,8 @@ default void tap(String selector) {
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
    * TimeoutError}. Passing zero timeout disables this.
    *
-   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser
-   * context is false.
+   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} will throw if the {@code hasTouch} option of the browser context is
+   * false.
    *
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be used.
    * @since v1.8
@@ -7548,7 +7857,7 @@ default void uncheck(String selector) {
    * Removes a route created with {@link com.microsoft.playwright.Page#route Page.route()}. When {@code handler} is not
    * specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while routing.
    * @since v1.8
    */
   default void unroute(String url) {
@@ -7558,7 +7867,7 @@ default void unroute(String url) {
    * Removes a route created with {@link com.microsoft.playwright.Page#route Page.route()}. When {@code handler} is not
    * specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while routing.
    * @param handler Optional handler function to route the request.
    * @since v1.8
    */
@@ -7567,7 +7876,7 @@ default void unroute(String url) {
    * Removes a route created with {@link com.microsoft.playwright.Page#route Page.route()}. When {@code handler} is not
    * specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while routing.
    * @since v1.8
    */
   default void unroute(Pattern url) {
@@ -7577,7 +7886,7 @@ default void unroute(Pattern url) {
    * Removes a route created with {@link com.microsoft.playwright.Page#route Page.route()}. When {@code handler} is not
    * specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while routing.
    * @param handler Optional handler function to route the request.
    * @since v1.8
    */
@@ -7586,7 +7895,7 @@ default void unroute(Pattern url) {
    * Removes a route created with {@link com.microsoft.playwright.Page#route Page.route()}. When {@code handler} is not
    * specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while routing.
    * @since v1.8
    */
   default void unroute(Predicate<String> url) {
@@ -7596,7 +7905,7 @@ default void unroute(Predicate<String> url) {
    * Removes a route created with {@link com.microsoft.playwright.Page#route Page.route()}. When {@code handler} is not
    * specified, removes all routes for the {@code url}.
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while routing.
    * @param handler Optional handler function to route the request.
    * @since v1.8
    */
@@ -7608,7 +7917,8 @@ default void unroute(Predicate<String> url) {
    */
   String url();
   /**
-   * Video object associated with this page.
+   * Video object associated with this page. Can be used to access the video file when using the {@code recordVideo} context
+   * option.
    *
    * @since v1.8
    */
@@ -8434,7 +8744,7 @@ default void waitForCondition(BooleanSupplier condition) {
    * page.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -8451,7 +8761,7 @@ default void waitForURL(String url) {
    * page.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -8466,7 +8776,7 @@ default void waitForURL(String url) {
    * page.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -8483,7 +8793,7 @@ default void waitForURL(Pattern url) {
    * page.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -8498,7 +8808,7 @@ default void waitForURL(Pattern url) {
    * page.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
@@ -8515,7 +8825,7 @@ default void waitForURL(Predicate<String> url) {
    * page.waitForURL("**\/target.html");
    * }</pre>
    *
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if the
+   * @param url A glob pattern, regex pattern, or predicate receiving [URL] to match while waiting for the navigation. Note that if the
    * parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly equal to
    * the string.
    * @since v1.11
diff --git a/playwright/src/main/java/com/microsoft/playwright/Request.java b/playwright/src/main/java/com/microsoft/playwright/Request.java
index 39c6880de..6b41bae58 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Request.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Request.java
@@ -183,6 +183,16 @@ public interface Request {
    * @since v1.8
    */
   Response response();
+  /**
+   * Returns the {@code Response} object if the response has already been received, {@code null} otherwise.
+   *
+   * <p> Unlike {@link com.microsoft.playwright.Request#response Request.response()}, this method does not wait for the response
+   * to arrive. It returns immediately with the response object if the response has been received, or {@code null} if the
+   * response has not been received yet.
+   *
+   * @since v1.59
+   */
+  Response existingResponse();
   /**
    * Returns resource size information for given request.
    *
diff --git a/playwright/src/main/java/com/microsoft/playwright/Response.java b/playwright/src/main/java/com/microsoft/playwright/Response.java
index 1eec90a31..819df6db5 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Response.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Response.java
@@ -86,6 +86,12 @@ public interface Response {
    * @since v1.15
    */
   List<String> headerValues(String name);
+  /**
+   * Returns the http version used by the response.
+   *
+   * @since v1.59
+   */
+  String httpVersion();
   /**
    * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
    *
diff --git a/playwright/src/main/java/com/microsoft/playwright/Route.java b/playwright/src/main/java/com/microsoft/playwright/Route.java
index e9bc75a7f..472a9f9a4 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Route.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Route.java
@@ -370,9 +370,10 @@ default void abort() {
    * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
    * next matching handler in the chain to be invoked.
    *
-   * <p> <strong>NOTE:</strong> The {@code Cookie} header cannot be overridden using this method. If a value is provided, it will be ignored, and the
-   * cookie will be loaded from the browser's cookie store. To set custom cookies, use {@link
-   * com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
+   * <p> <strong>NOTE:</strong> Some request headers are **forbidden** and cannot be overridden (for example, {@code Cookie}, {@code Host}, {@code
+   * Content-Length} and others, see <a
+   * href="https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header">this MDN page</a> for full list). If
+   * an override is provided for a forbidden header, it will be ignored and the original request header will be used.To set custom cookies, use {@link com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
    *
    * @since v1.8
    */
@@ -402,9 +403,10 @@ default void resume() {
    * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
    * next matching handler in the chain to be invoked.
    *
-   * <p> <strong>NOTE:</strong> The {@code Cookie} header cannot be overridden using this method. If a value is provided, it will be ignored, and the
-   * cookie will be loaded from the browser's cookie store. To set custom cookies, use {@link
-   * com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
+   * <p> <strong>NOTE:</strong> Some request headers are **forbidden** and cannot be overridden (for example, {@code Cookie}, {@code Host}, {@code
+   * Content-Length} and others, see <a
+   * href="https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header">this MDN page</a> for full list). If
+   * an override is provided for a forbidden header, it will be ignored and the original request header will be used.To set custom cookies, use {@link com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
    *
    * @since v1.8
    */
diff --git a/playwright/src/main/java/com/microsoft/playwright/Screencast.java b/playwright/src/main/java/com/microsoft/playwright/Screencast.java
new file mode 100644
index 000000000..ea545e1a9
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/Screencast.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.*;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.function.Consumer;
+
+/**
+ * Interface for capturing screencast frames from a page.
+ */
+public interface Screencast {
+  class StartOptions {
+    /**
+     * Callback that receives JPEG-encoded frame data along with the page viewport size at the time of capture.
+     */
+    public Consumer<ScreencastFrame> onFrame;
+    /**
+     * Path where the video should be saved when the screencast is stopped. When provided, video recording is started.
+     */
+    public Path path;
+    /**
+     * The quality of the image, between 0-100.
+     */
+    public Integer quality;
+    /**
+     * Specifies the dimensions of screencast frames. The actual frame is scaled to preserve the page's aspect ratio and may be
+     * smaller than these bounds. If a screencast is already active (e.g. started by tracing or video recording), the existing
+     * configuration takes precedence and the frame size may exceed these bounds or this option may be ignored. If not
+     * specified the size will be equal to page viewport scaled down to fit into 800×800.
+     */
+    public Size size;
+
+    /**
+     * Callback that receives JPEG-encoded frame data along with the page viewport size at the time of capture.
+     */
+    public StartOptions setOnFrame(Consumer<ScreencastFrame> onFrame) {
+      this.onFrame = onFrame;
+      return this;
+    }
+    /**
+     * Path where the video should be saved when the screencast is stopped. When provided, video recording is started.
+     */
+    public StartOptions setPath(Path path) {
+      this.path = path;
+      return this;
+    }
+    /**
+     * The quality of the image, between 0-100.
+     */
+    public StartOptions setQuality(int quality) {
+      this.quality = quality;
+      return this;
+    }
+    /**
+     * Specifies the dimensions of screencast frames. The actual frame is scaled to preserve the page's aspect ratio and may be
+     * smaller than these bounds. If a screencast is already active (e.g. started by tracing or video recording), the existing
+     * configuration takes precedence and the frame size may exceed these bounds or this option may be ignored. If not
+     * specified the size will be equal to page viewport scaled down to fit into 800×800.
+     */
+    public StartOptions setSize(int width, int height) {
+      return setSize(new Size(width, height));
+    }
+    /**
+     * Specifies the dimensions of screencast frames. The actual frame is scaled to preserve the page's aspect ratio and may be
+     * smaller than these bounds. If a screencast is already active (e.g. started by tracing or video recording), the existing
+     * configuration takes precedence and the frame size may exceed these bounds or this option may be ignored. If not
+     * specified the size will be equal to page viewport scaled down to fit into 800×800.
+     */
+    public StartOptions setSize(Size size) {
+      this.size = size;
+      return this;
+    }
+  }
+  class ShowOverlayOptions {
+    /**
+     * Duration in milliseconds after which the overlay is automatically removed. Overlay stays until dismissed if not
+     * provided.
+     */
+    public Double duration;
+
+    /**
+     * Duration in milliseconds after which the overlay is automatically removed. Overlay stays until dismissed if not
+     * provided.
+     */
+    public ShowOverlayOptions setDuration(double duration) {
+      this.duration = duration;
+      return this;
+    }
+  }
+  class ShowChapterOptions {
+    /**
+     * Optional description text displayed below the title.
+     */
+    public String description;
+    /**
+     * Duration in milliseconds after which the overlay is automatically removed. Defaults to {@code 2000}.
+     */
+    public Double duration;
+
+    /**
+     * Optional description text displayed below the title.
+     */
+    public ShowChapterOptions setDescription(String description) {
+      this.description = description;
+      return this;
+    }
+    /**
+     * Duration in milliseconds after which the overlay is automatically removed. Defaults to {@code 2000}.
+     */
+    public ShowChapterOptions setDuration(double duration) {
+      this.duration = duration;
+      return this;
+    }
+  }
+  class ShowActionsOptions {
+    /**
+     * Cursor decoration shown for pointer actions. {@code "pointer"} (the default) renders a mouse pointer that animates from
+     * the previous action point to the next one. {@code "none"} disables the cursor decoration.
+     */
+    public ScreencastCursor cursor;
+    /**
+     * How long each annotation is displayed in milliseconds. Defaults to {@code 500}.
+     */
+    public Double duration;
+    /**
+     * Font size of the action title in pixels. Defaults to {@code 24}.
+     */
+    public Integer fontSize;
+    /**
+     * Position of the action title overlay. Defaults to {@code "top-right"}.
+     */
+    public AnnotatePosition position;
+
+    /**
+     * Cursor decoration shown for pointer actions. {@code "pointer"} (the default) renders a mouse pointer that animates from
+     * the previous action point to the next one. {@code "none"} disables the cursor decoration.
+     */
+    public ShowActionsOptions setCursor(ScreencastCursor cursor) {
+      this.cursor = cursor;
+      return this;
+    }
+    /**
+     * How long each annotation is displayed in milliseconds. Defaults to {@code 500}.
+     */
+    public ShowActionsOptions setDuration(double duration) {
+      this.duration = duration;
+      return this;
+    }
+    /**
+     * Font size of the action title in pixels. Defaults to {@code 24}.
+     */
+    public ShowActionsOptions setFontSize(int fontSize) {
+      this.fontSize = fontSize;
+      return this;
+    }
+    /**
+     * Position of the action title overlay. Defaults to {@code "top-right"}.
+     */
+    public ShowActionsOptions setPosition(AnnotatePosition position) {
+      this.position = position;
+      return this;
+    }
+  }
+  /**
+   * Starts the screencast. When {@code path} is provided, it saves video recording to the specified file. When {@code
+   * onFrame} is provided, delivers JPEG-encoded frames to the callback. Both can be used together.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * @since v1.59
+   */
+  default AutoCloseable start() {
+    return start(null);
+  }
+  /**
+   * Starts the screencast. When {@code path} is provided, it saves video recording to the specified file. When {@code
+   * onFrame} is provided, delivers JPEG-encoded frames to the callback. Both can be used together.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * @since v1.59
+   */
+  AutoCloseable start(StartOptions options);
+  /**
+   * Stops the screencast and video recording if active. If a video was being recorded, saves it to the path specified in
+   * {@link com.microsoft.playwright.Screencast#start Screencast.start()}.
+   *
+   * @since v1.59
+   */
+  void stop();
+  /**
+   * Adds an overlay with the given HTML content. The overlay is displayed on top of the page until removed. Returns a
+   * disposable that removes the overlay when disposed.
+   *
+   * @param html HTML content for the overlay.
+   * @since v1.59
+   */
+  default AutoCloseable showOverlay(String html) {
+    return showOverlay(html, null);
+  }
+  /**
+   * Adds an overlay with the given HTML content. The overlay is displayed on top of the page until removed. Returns a
+   * disposable that removes the overlay when disposed.
+   *
+   * @param html HTML content for the overlay.
+   * @since v1.59
+   */
+  AutoCloseable showOverlay(String html, ShowOverlayOptions options);
+  /**
+   * Shows a chapter overlay with a title and optional description, centered on the page with a blurred backdrop. Useful for
+   * narrating video recordings. The overlay is removed after the specified duration, or 2000ms.
+   *
+   * @param title Title text displayed prominently in the overlay.
+   * @since v1.59
+   */
+  default void showChapter(String title) {
+    showChapter(title, null);
+  }
+  /**
+   * Shows a chapter overlay with a title and optional description, centered on the page with a blurred backdrop. Useful for
+   * narrating video recordings. The overlay is removed after the specified duration, or 2000ms.
+   *
+   * @param title Title text displayed prominently in the overlay.
+   * @since v1.59
+   */
+  void showChapter(String title, ShowChapterOptions options);
+  /**
+   * Enables visual annotations on interacted elements. Returns a disposable that stops showing actions when disposed.
+   *
+   * @since v1.59
+   */
+  default AutoCloseable showActions() {
+    return showActions(null);
+  }
+  /**
+   * Enables visual annotations on interacted elements. Returns a disposable that stops showing actions when disposed.
+   *
+   * @since v1.59
+   */
+  AutoCloseable showActions(ShowActionsOptions options);
+  /**
+   * Shows overlays.
+   *
+   * @since v1.59
+   */
+  void showOverlays();
+  /**
+   * Removes action decorations.
+   *
+   * @since v1.59
+   */
+  void hideActions();
+  /**
+   * Hides overlays without removing them.
+   *
+   * @since v1.59
+   */
+  void hideOverlays();
+}
+
diff --git a/playwright/src/main/java/com/microsoft/playwright/ScreencastFrame.java b/playwright/src/main/java/com/microsoft/playwright/ScreencastFrame.java
new file mode 100644
index 000000000..8a690792b
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/ScreencastFrame.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+public interface ScreencastFrame {
+  /**
+   * JPEG-encoded frame data.
+   */
+  byte[] data();
+
+  /**
+   * The timestamp of when the frame was presented by the browser, in milliseconds since the Unix epoch.
+   */
+  double timestamp();
+
+  /**
+   * Width of the page viewport at the time the frame was captured.
+   */
+  int viewportWidth();
+
+  /**
+   * Height of the page viewport at the time the frame was captured.
+   */
+  int viewportHeight();
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/Selectors.java b/playwright/src/main/java/com/microsoft/playwright/Selectors.java
index 1bc0fe47a..465de6f37 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Selectors.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Selectors.java
@@ -201,7 +201,8 @@ default void register(String name, Path script) {
    * Defines custom attribute name to be used in {@link com.microsoft.playwright.Page#getByTestId Page.getByTestId()}. {@code
    * data-testid} is used by default.
    *
-   * @param attributeName Test id attribute name.
+   * @param attributeName Test id attribute name. To match elements with any of several attributes, pass them as a comma-separated list, e.g.
+   * {@code "data-pw,data-ti"}.
    * @since v1.27
    */
   void setTestIdAttribute(String attributeName);
diff --git a/playwright/src/main/java/com/microsoft/playwright/Touchscreen.java b/playwright/src/main/java/com/microsoft/playwright/Touchscreen.java
index 2024016c1..c90dbb435 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Touchscreen.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Touchscreen.java
@@ -28,8 +28,8 @@ public interface Touchscreen {
   /**
    * Dispatches a {@code touchstart} and {@code touchend} event with a single touch at the position ({@code x},{@code y}).
    *
-   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser
-   * context is false.
+   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Touchscreen#tap Touchscreen.tap()} will throw if the {@code hasTouch} option of the
+   * browser context is false.
    *
    * @param x X coordinate relative to the main frame's viewport in CSS pixels.
    * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
diff --git a/playwright/src/main/java/com/microsoft/playwright/Tracing.java b/playwright/src/main/java/com/microsoft/playwright/Tracing.java
index 987218b41..d21cfe133 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Tracing.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Tracing.java
@@ -18,6 +18,7 @@
 
 import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 /**
  * API for collecting and saving Playwright traces. Playwright traces can be opened in <a
@@ -44,6 +45,12 @@
  */
 public interface Tracing {
   class StartOptions {
+    /**
+     * When enabled, the trace is written to an unarchived file that is updated in real time as actions occur, instead of
+     * caching changes and archiving them into a zip file at the end. This is useful for live trace viewing during test
+     * execution.
+     */
+    public Boolean live;
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
      * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
@@ -74,6 +81,15 @@ class StartOptions {
      */
     public String title;
 
+    /**
+     * When enabled, the trace is written to an unarchived file that is updated in real time as actions occur, instead of
+     * caching changes and archiving them into a zip file at the end. This is useful for live trace viewing during test
+     * execution.
+     */
+    public StartOptions setLive(boolean live) {
+      this.live = live;
+      return this;
+    }
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
      * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
@@ -150,6 +166,59 @@ public StartChunkOptions setTitle(String title) {
       return this;
     }
   }
+  class StartHarOptions {
+    /**
+     * Optional setting to control resource content management. If {@code omit} is specified, content is not persisted. If
+     * {@code attach} is specified, resources are persisted as separate files or entries in the ZIP archive. If {@code embed}
+     * is specified, content is stored inline the HAR file as per HAR specification. Defaults to {@code attach} for {@code
+     * .zip} output files and to {@code embed} for all other file extensions.
+     */
+    public HarContentPolicy content;
+    /**
+     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
+     * full}.
+     */
+    public HarMode mode;
+    /**
+     * A glob or regex pattern to filter requests that are stored in the HAR. Defaults to none.
+     */
+    public Object urlFilter;
+
+    /**
+     * Optional setting to control resource content management. If {@code omit} is specified, content is not persisted. If
+     * {@code attach} is specified, resources are persisted as separate files or entries in the ZIP archive. If {@code embed}
+     * is specified, content is stored inline the HAR file as per HAR specification. Defaults to {@code attach} for {@code
+     * .zip} output files and to {@code embed} for all other file extensions.
+     */
+    public StartHarOptions setContent(HarContentPolicy content) {
+      this.content = content;
+      return this;
+    }
+    /**
+     * When set to {@code minimal}, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to {@code
+     * full}.
+     */
+    public StartHarOptions setMode(HarMode mode) {
+      this.mode = mode;
+      return this;
+    }
+    /**
+     * A glob or regex pattern to filter requests that are stored in the HAR. Defaults to none.
+     */
+    public StartHarOptions setUrlFilter(String urlFilter) {
+      this.urlFilter = urlFilter;
+      return this;
+    }
+    /**
+     * A glob or regex pattern to filter requests that are stored in the HAR. Defaults to none.
+     */
+    public StartHarOptions setUrlFilter(Pattern urlFilter) {
+      this.urlFilter = urlFilter;
+      return this;
+    }
+  }
   class GroupOptions {
     /**
      * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the {@link
@@ -313,6 +382,48 @@ default void startChunk() {
    * @since v1.15
    */
   void startChunk(StartChunkOptions options);
+  /**
+   * Start recording a HAR (HTTP Archive) of network activity in this context. The HAR file is written to disk when {@link
+   * com.microsoft.playwright.Tracing#stopHar Tracing.stopHar()} is called, or when the returned {@code Disposable} is
+   * disposed.
+   *
+   * <p> Only one HAR recording can be active at a time per {@code BrowserContext}.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * context.tracing().startHar(Paths.get("trace.har"));
+   * Page page = context.newPage();
+   * page.navigate("https://playwright.dev");
+   * context.tracing().stopHar();
+   * }</pre>
+   *
+   * @param path Path on the filesystem to write the HAR file to. If the file name ends with {@code .zip}, the HAR is saved as a zip
+   * archive with response bodies attached as separate files.
+   * @since v1.60
+   */
+  default AutoCloseable startHar(Path path) {
+    return startHar(path, null);
+  }
+  /**
+   * Start recording a HAR (HTTP Archive) of network activity in this context. The HAR file is written to disk when {@link
+   * com.microsoft.playwright.Tracing#stopHar Tracing.stopHar()} is called, or when the returned {@code Disposable} is
+   * disposed.
+   *
+   * <p> Only one HAR recording can be active at a time per {@code BrowserContext}.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * context.tracing().startHar(Paths.get("trace.har"));
+   * Page page = context.newPage();
+   * page.navigate("https://playwright.dev");
+   * context.tracing().stopHar();
+   * }</pre>
+   *
+   * @param path Path on the filesystem to write the HAR file to. If the file name ends with {@code .zip}, the HAR is saved as a zip
+   * archive with response bodies attached as separate files.
+   * @since v1.60
+   */
+  AutoCloseable startHar(Path path, StartHarOptions options);
   /**
    * <strong>NOTE:</strong> Use {@code test.step} instead when available.
    *
@@ -333,8 +444,8 @@ default void startChunk() {
    * @param name Group name shown in the trace viewer.
    * @since v1.49
    */
-  default void group(String name) {
-    group(name, null);
+  default AutoCloseable group(String name) {
+    return group(name, null);
   }
   /**
    * <strong>NOTE:</strong> Use {@code test.step} instead when available.
@@ -356,7 +467,7 @@ default void group(String name) {
    * @param name Group name shown in the trace viewer.
    * @since v1.49
    */
-  void group(String name, GroupOptions options);
+  AutoCloseable group(String name, GroupOptions options);
   /**
    * Closes the last group created by {@link com.microsoft.playwright.Tracing#group Tracing.group()}.
    *
@@ -393,5 +504,12 @@ default void stopChunk() {
    * @since v1.15
    */
   void stopChunk(StopChunkOptions options);
+  /**
+   * Stop HAR recording and save the HAR file to the path given to {@link com.microsoft.playwright.Tracing#startHar
+   * Tracing.startHar()}.
+   *
+   * @since v1.60
+   */
+  void stopHar();
 }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/Video.java b/playwright/src/main/java/com/microsoft/playwright/Video.java
index 4ef582a4d..351ba87fe 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Video.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Video.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 
 /**
diff --git a/playwright/src/main/java/com/microsoft/playwright/WebError.java b/playwright/src/main/java/com/microsoft/playwright/WebError.java
index 0eb5923a7..4576536ba 100644
--- a/playwright/src/main/java/com/microsoft/playwright/WebError.java
+++ b/playwright/src/main/java/com/microsoft/playwright/WebError.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 
 /**
  * {@code WebError} class represents an unhandled exception thrown in the page. It is dispatched via the {@link
@@ -43,5 +44,11 @@ public interface WebError {
    * @since v1.38
    */
   String error();
+  /**
+   *
+   *
+   * @since v1.60
+   */
+  WebErrorLocation location();
 }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/WebSocketRoute.java b/playwright/src/main/java/com/microsoft/playwright/WebSocketRoute.java
index d8303830b..29e5398bc 100644
--- a/playwright/src/main/java/com/microsoft/playwright/WebSocketRoute.java
+++ b/playwright/src/main/java/com/microsoft/playwright/WebSocketRoute.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -213,6 +214,27 @@ default void close() {
    * @since v1.48
    */
   void send(byte[] message);
+  /**
+   * The list of WebSocket subprotocols requested by the page, as passed via the second argument to the <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/WebSocket">{@code WebSocket} constructor</a>.
+   * Corresponds to the {@code Sec-WebSocket-Protocol} request header.
+   *
+   * <p> Returns an empty array if no protocols were specified.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.routeWebSocket("wss://example.com/ws", ws -> {
+   *   if (ws.protocols().contains("chat.v2")) {
+   *     ws.onMessage(frame -> ws.send("v2:" + frame.text()));
+   *   } else {
+   *     ws.close(1002, "Unsupported protocol");
+   *   }
+   * });
+   * }</pre>
+   *
+   * @since v1.60
+   */
+  List<String> protocols();
   /**
    * URL of the WebSocket created in the page.
    *
diff --git a/playwright/src/main/java/com/microsoft/playwright/WebStorage.java b/playwright/src/main/java/com/microsoft/playwright/WebStorage.java
new file mode 100644
index 000000000..d141c09c0
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/WebStorage.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.*;
+import java.util.*;
+
+/**
+ * WebStorage exposes the page's {@code localStorage} or {@code sessionStorage} for the current origin via an async, <a
+ * href="https://developer.mozilla.org/en-US/docs/Web/API/Storage">browser-consistent</a> API.
+ *
+ * <p> Instances are accessed through {@link com.microsoft.playwright.Page#localStorage Page.localStorage()} and {@link
+ * com.microsoft.playwright.Page#sessionStorage Page.sessionStorage()}.
+ * <pre>{@code
+ * page.navigate("https://example.com");
+ * page.localStorage().setItem("token", "abc");
+ * String token = page.localStorage().getItem("token");
+ * List<WebStorageItem> all = page.localStorage().items();
+ * page.localStorage().removeItem("token");
+ * page.localStorage().clear();
+ * }</pre>
+ */
+public interface WebStorage {
+  /**
+   * Returns all items in the storage as name/value pairs.
+   *
+   * @since v1.61
+   */
+  List<WebStorageItem> items();
+  /**
+   * Returns the value for the given {@code name} if present.
+   *
+   * @param name Name of the item to retrieve.
+   * @since v1.61
+   */
+  String getItem(String name);
+  /**
+   * Sets the value for the given {@code name}. Overwrites any existing value for that name.
+   *
+   * @param name Name of the item to set.
+   * @param value New value for the item.
+   * @since v1.61
+   */
+  void setItem(String name, String value);
+  /**
+   * Removes the item with the given {@code name}. No-op if the item is absent.
+   *
+   * @param name Name of the item to remove.
+   * @since v1.61
+   */
+  void removeItem(String name);
+  /**
+   * Removes all items from the storage.
+   *
+   * @since v1.61
+   */
+  void clear();
+}
+
diff --git a/playwright/src/main/java/com/microsoft/playwright/Worker.java b/playwright/src/main/java/com/microsoft/playwright/Worker.java
index ae2b28341..d5d93734b 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Worker.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Worker.java
@@ -17,6 +17,7 @@
 package com.microsoft.playwright;
 
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 
 /**
  * The Worker class represents a <a href="https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API">WebWorker</a>.
@@ -44,6 +45,16 @@ public interface Worker {
    */
   void offClose(Consumer<Worker> handler);
 
+  /**
+   * Emitted when JavaScript within the worker calls one of console API methods, e.g. {@code console.log} or {@code
+   * console.dir}.
+   */
+  void onConsole(Consumer<ConsoleMessage> handler);
+  /**
+   * Removes handler that was previously added with {@link #onConsole onConsole(handler)}.
+   */
+  void offConsole(Consumer<ConsoleMessage> handler);
+
   class WaitForCloseOptions {
     /**
      * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
@@ -62,6 +73,35 @@ public WaitForCloseOptions setTimeout(double timeout) {
       return this;
     }
   }
+  class WaitForConsoleMessageOptions {
+    /**
+     * Receives the {@code ConsoleMessage} object and resolves to true when the waiting should resolve.
+     */
+    public Predicate<ConsoleMessage> predicate;
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()}.
+     */
+    public Double timeout;
+
+    /**
+     * Receives the {@code ConsoleMessage} object and resolves to true when the waiting should resolve.
+     */
+    public WaitForConsoleMessageOptions setPredicate(Predicate<ConsoleMessage> predicate) {
+      this.predicate = predicate;
+      return this;
+    }
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
+     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
+     * BrowserContext.setDefaultTimeout()}.
+     */
+    public WaitForConsoleMessageOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
   /**
    * Returns the return value of {@code expression}.
    *
@@ -158,5 +198,21 @@ default Worker waitForClose(Runnable callback) {
    * @since v1.10
    */
   Worker waitForClose(WaitForCloseOptions options, Runnable callback);
+  /**
+   * Performs action and waits for a console message.
+   *
+   * @param callback Callback that performs the action triggering the event.
+   * @since v1.57
+   */
+  default ConsoleMessage waitForConsoleMessage(Runnable callback) {
+    return waitForConsoleMessage(null, callback);
+  }
+  /**
+   * Performs action and waits for a console message.
+   *
+   * @param callback Callback that performs the action triggering the event.
+   * @since v1.57
+   */
+  ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable callback);
 }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/assertions/APIResponseAssertions.java b/playwright/src/main/java/com/microsoft/playwright/assertions/APIResponseAssertions.java
index 70cfd8e02..df27383cb 100644
--- a/playwright/src/main/java/com/microsoft/playwright/assertions/APIResponseAssertions.java
+++ b/playwright/src/main/java/com/microsoft/playwright/assertions/APIResponseAssertions.java
@@ -37,8 +37,11 @@
  */
 public interface APIResponseAssertions {
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the response status is not
-   * successful:
+   * Makes the assertion check for the opposite condition.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> For example, this code tests that the response status is not successful:
    * <pre>{@code
    * assertThat(response).not().isOK();
    * }</pre>
diff --git a/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java b/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java
index e541404af..780b87751 100644
--- a/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java
+++ b/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java
@@ -19,6 +19,7 @@
 import java.util.*;
 import java.util.regex.Pattern;
 import com.microsoft.playwright.options.AriaRole;
+import com.microsoft.playwright.options.PseudoElement;
 
 /**
  * The {@code LocatorAssertions} class provides assertion methods that can be used to make assertions about the {@code
@@ -427,11 +428,22 @@ public HasCountOptions setTimeout(double timeout) {
     }
   }
   class HasCSSOptions {
+    /**
+     * Pseudo-element to read computed styles from.
+     */
+    public PseudoElement pseudo;
     /**
      * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
      */
     public Double timeout;
 
+    /**
+     * Pseudo-element to read computed styles from.
+     */
+    public HasCSSOptions setPseudo(PseudoElement pseudo) {
+      this.pseudo = pseudo;
+      return this;
+    }
     /**
      * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
      */
@@ -563,8 +575,11 @@ public MatchesAriaSnapshotOptions setTimeout(double timeout) {
     }
   }
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the Locator doesn't contain text
-   * {@code "error"}:
+   * Makes the assertion check for the opposite condition.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> For example, this code tests that the Locator doesn't contain text {@code "error"}:
    * <pre>{@code
    * assertThat(locator).not().containsText("error");
    * }</pre>
@@ -885,7 +900,7 @@ default void isVisible() {
    * <p> When an array is passed, the method asserts that the list of elements located matches the corresponding list of expected
    * class lists. Each element's class attribute is matched against the corresponding class in the array:
    * <pre>{@code
-   * assertThat(page.locator(".list > .component")).containsClass(new String[] {"inactive", "active", "inactive"});
+   * assertThat(page.locator(".list > .component")).containsClass(Arrays.asList("inactive", "active", "inactive"));
    * }</pre>
    *
    * @param expected A string containing expected class names, separated by spaces, or a list of such strings to assert multiple elements.
@@ -909,7 +924,7 @@ default void containsClass(String expected) {
    * <p> When an array is passed, the method asserts that the list of elements located matches the corresponding list of expected
    * class lists. Each element's class attribute is matched against the corresponding class in the array:
    * <pre>{@code
-   * assertThat(page.locator(".list > .component")).containsClass(new String[] {"inactive", "active", "inactive"});
+   * assertThat(page.locator(".list > .component")).containsClass(Arrays.asList("inactive", "active", "inactive"));
    * }</pre>
    *
    * @param expected A string containing expected class names, separated by spaces, or a list of such strings to assert multiple elements.
@@ -931,7 +946,7 @@ default void containsClass(String expected) {
    * <p> When an array is passed, the method asserts that the list of elements located matches the corresponding list of expected
    * class lists. Each element's class attribute is matched against the corresponding class in the array:
    * <pre>{@code
-   * assertThat(page.locator(".list > .component")).containsClass(new String[] {"inactive", "active", "inactive"});
+   * assertThat(page.locator(".list > .component")).containsClass(Arrays.asList("inactive", "active", "inactive"));
    * }</pre>
    *
    * @param expected A string containing expected class names, separated by spaces, or a list of such strings to assert multiple elements.
@@ -955,7 +970,7 @@ default void containsClass(List<String> expected) {
    * <p> When an array is passed, the method asserts that the list of elements located matches the corresponding list of expected
    * class lists. Each element's class attribute is matched against the corresponding class in the array:
    * <pre>{@code
-   * assertThat(page.locator(".list > .component")).containsClass(new String[] {"inactive", "active", "inactive"});
+   * assertThat(page.locator(".list > .component")).containsClass(Arrays.asList("inactive", "active", "inactive"));
    * }</pre>
    *
    * @param expected A string containing expected class names, separated by spaces, or a list of such strings to assert multiple elements.
@@ -989,7 +1004,7 @@ default void containsClass(List<String> expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
@@ -1034,7 +1049,7 @@ default void containsText(String expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
@@ -1077,7 +1092,7 @@ default void containsText(String expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
@@ -1122,7 +1137,7 @@ default void containsText(Pattern expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
@@ -1165,7 +1180,7 @@ default void containsText(Pattern expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
@@ -1210,7 +1225,7 @@ default void containsText(String[] expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
@@ -1253,7 +1268,7 @@ default void containsText(String[] expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
@@ -1298,7 +1313,7 @@ default void containsText(Pattern[] expected) {
    * <p> Let's see how we can use the assertion:
    * <pre>{@code
    * // ✓ Contains the right items in the right order
-   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3", "Text 4"});
+   * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 1", "Text 3"});
    *
    * // ✖ Wrong order
    * assertThat(page.locator("ul > li")).containsText(new String[] {"Text 3", "Text 2"});
diff --git a/playwright/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java b/playwright/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java
index 734c9a1f9..88e529e38 100644
--- a/playwright/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java
+++ b/playwright/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java
@@ -37,6 +37,20 @@
  * }</pre>
  */
 public interface PageAssertions {
+  class MatchesAriaSnapshotOptions {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public MatchesAriaSnapshotOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
   class HasTitleOptions {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
@@ -79,8 +93,11 @@ public HasURLOptions setTimeout(double timeout) {
     }
   }
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't contain
-   * {@code "error"}:
+   * Makes the assertion check for the opposite condition.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> For example, this code tests that the page URL doesn't contain {@code "error"}:
    * <pre>{@code
    * assertThat(page).not().hasURL("error");
    * }</pre>
@@ -88,6 +105,40 @@ public HasURLOptions setTimeout(double timeout) {
    * @since v1.20
    */
   PageAssertions not();
+  /**
+   * Asserts that the page body matches the given <a href="https://playwright.dev/java/docs/aria-snapshots">accessibility
+   * snapshot</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.navigate("https://demo.playwright.dev/todomvc/");
+   * assertThat(page).matchesAriaSnapshot("""
+   *   - heading "todos"
+   *   - textbox "What needs to be done?"
+   * """);
+   * }</pre>
+   *
+   * @since v1.60
+   */
+  default void matchesAriaSnapshot(String expected) {
+    matchesAriaSnapshot(expected, null);
+  }
+  /**
+   * Asserts that the page body matches the given <a href="https://playwright.dev/java/docs/aria-snapshots">accessibility
+   * snapshot</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.navigate("https://demo.playwright.dev/todomvc/");
+   * assertThat(page).matchesAriaSnapshot("""
+   *   - heading "todos"
+   *   - textbox "What needs to be done?"
+   * """);
+   * }</pre>
+   *
+   * @since v1.60
+   */
+  void matchesAriaSnapshot(String expected, MatchesAriaSnapshotOptions options);
   /**
    * Ensures the page has the given title.
    *
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java
index 21249c30f..e28cfa810 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java
@@ -46,6 +46,11 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
     this.tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
   }
 
+  @Override
+  public com.microsoft.playwright.Tracing tracing() {
+    return tracing;
+  }
+
   @Override
   public APIResponse delete(String url, RequestOptions options) {
     return fetch(url, ensureOptions(options, "DELETE"));
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java
index 771fb3658..21f96b2cb 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseImpl.java
@@ -22,6 +22,9 @@
 import com.microsoft.playwright.APIResponse;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.HttpHeader;
+import com.microsoft.playwright.options.SecurityDetails;
+import com.microsoft.playwright.options.ServerAddr;
+import com.microsoft.playwright.options.Timing;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -85,6 +88,22 @@ public boolean ok() {
     return status == 0 || (status >= 200 && status <= 299);
   }
 
+  @Override
+  public SecurityDetails securityDetails() {
+    if (!initializer.has("securityDetails")) {
+      return null;
+    }
+    return gson().fromJson(initializer.get("securityDetails"), SecurityDetails.class);
+  }
+
+  @Override
+  public ServerAddr serverAddr() {
+    if (!initializer.has("serverAddr")) {
+      return null;
+    }
+    return gson().fromJson(initializer.get("serverAddr"), ServerAddr.class);
+  }
+
   @Override
   public int status() {
     return initializer.get("status").getAsInt();
@@ -100,6 +119,26 @@ public String text() {
     return new String(body(), StandardCharsets.UTF_8);
   }
 
+  @Override
+  public Timing timing() {
+    Timing timing;
+    if (initializer.has("timing")) {
+      timing = gson().fromJson(initializer.get("timing"), Timing.class);
+    } else {
+      timing = new Timing();
+      timing.startTime = -1;
+      timing.domainLookupStart = -1;
+      timing.domainLookupEnd = -1;
+      timing.connectStart = -1;
+      timing.secureConnectionStart = -1;
+      timing.connectEnd = -1;
+      timing.requestStart = -1;
+      timing.responseStart = -1;
+    }
+    timing.responseEnd = initializer.has("responseEndTiming") ? initializer.get("responseEndTiming").getAsDouble() : -1;
+    return timing;
+  }
+
   @Override
   public String url() {
     return initializer.get("url").getAsString();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/AssertionsBase.java b/playwright/src/main/java/com/microsoft/playwright/impl/AssertionsBase.java
index 48c6c3f7e..5e9a6520b 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/AssertionsBase.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/AssertionsBase.java
@@ -57,7 +57,14 @@ void expectImpl(String expression, FrameExpectOptions expectOptions, Object expe
     }
     FrameExpectResult result = doExpect(expression, expectOptions, title);
     if (result.matches == isNot) {
-      Object actual = result.received == null ? null : Serialization.deserialize(result.received);
+      Object actual;
+      if (result.received == null) {
+        actual = null;
+      } else if (result.received.value != null) {
+        actual = Serialization.deserialize(result.received.value);
+      } else {
+        actual = result.received.ariaSnapshot;
+      }
       String log = (result.log == null) ? "" : String.join("\n", result.log);
       if (!log.isEmpty()) {
         log = "\nCall log:\n" + log;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
index 4edc31fc4..78c63f897 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -43,10 +43,11 @@
 class BrowserContextImpl extends ChannelOwner implements BrowserContext {
   protected BrowserImpl browser;
   private final TracingImpl tracing;
+  private final DebuggerImpl debugger;
   private final APIRequestContextImpl request;
   private final ClockImpl clock;
+  private final CredentialsImpl credentials;
   final List<PageImpl> pages = new ArrayList<>();
-  final List<PageImpl> backgroundPages = new ArrayList<>();
 
   final Router routes = new Router();
   final WebSocketRouter webSocketRoutes = new WebSocketRouter();
@@ -68,24 +69,18 @@ private static final Map<EventType, String> eventSubscriptions() {
   }
   private final ListenerCollection<EventType> listeners = new ListenerCollection<>(eventSubscriptions(), this);
   final TimeoutSettings timeoutSettings = new TimeoutSettings();
-  final Map<String, HarRecorder> harRecorders = new HashMap<>();
-
-  static class HarRecorder {
-    final Path path;
-    final HarContentPolicy contentPolicy;
-
-    HarRecorder(Path har, HarContentPolicy policy) {
-      path = har;
-      contentPolicy = policy;
-    }
-  }
 
   enum EventType {
-    BACKGROUNDPAGE,
     CLOSE,
     CONSOLE,
     DIALOG,
+    DOWNLOAD,
+    FRAMEATTACHED,
+    FRAMEDETACHED,
+    FRAMENAVIGATED,
     PAGE,
+    PAGECLOSE,
+    PAGELOAD,
     WEBERROR,
     REQUEST,
     REQUESTFAILED,
@@ -96,9 +91,11 @@ enum EventType {
   BrowserContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
     tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
+    debugger = connection.getExistingObject(initializer.getAsJsonObject("debugger").get("guid").getAsString());
     request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
     request.timeoutSettings = timeoutSettings;
     clock = new ClockImpl(this);
+    credentials = new CredentialsImpl(this);
     closePromise = new WaitableEvent<>(listeners, EventType.CLOSE);
   }
 
@@ -133,12 +130,24 @@ String effectiveCloseReason() {
 
   @Override
   public void onBackgroundPage(Consumer<Page> handler) {
-    listeners.add(EventType.BACKGROUNDPAGE, handler);
   }
 
   @Override
   public void offBackgroundPage(Consumer<Page> handler) {
-    listeners.remove(EventType.BACKGROUNDPAGE, handler);
+  }
+
+  @Override
+  public void onDownload(Consumer<Download> handler) {
+    listeners.add(EventType.DOWNLOAD, handler);
+  }
+
+  @Override
+  public void offDownload(Consumer<Download> handler) {
+    listeners.remove(EventType.DOWNLOAD, handler);
+  }
+
+  void notifyDownload(Download download) {
+    listeners.notify(EventType.DOWNLOAD, download);
   }
 
   @Override
@@ -181,6 +190,76 @@ public void offPage(Consumer<Page> handler) {
     listeners.remove(EventType.PAGE, handler);
   }
 
+  @Override
+  public void onFrameAttached(Consumer<Frame> handler) {
+    listeners.add(EventType.FRAMEATTACHED, handler);
+  }
+
+  @Override
+  public void offFrameAttached(Consumer<Frame> handler) {
+    listeners.remove(EventType.FRAMEATTACHED, handler);
+  }
+
+  void notifyFrameAttached(FrameImpl frame) {
+    listeners.notify(EventType.FRAMEATTACHED, frame);
+  }
+
+  @Override
+  public void onFrameDetached(Consumer<Frame> handler) {
+    listeners.add(EventType.FRAMEDETACHED, handler);
+  }
+
+  @Override
+  public void offFrameDetached(Consumer<Frame> handler) {
+    listeners.remove(EventType.FRAMEDETACHED, handler);
+  }
+
+  void notifyFrameDetached(FrameImpl frame) {
+    listeners.notify(EventType.FRAMEDETACHED, frame);
+  }
+
+  @Override
+  public void onFrameNavigated(Consumer<Frame> handler) {
+    listeners.add(EventType.FRAMENAVIGATED, handler);
+  }
+
+  @Override
+  public void offFrameNavigated(Consumer<Frame> handler) {
+    listeners.remove(EventType.FRAMENAVIGATED, handler);
+  }
+
+  void notifyFrameNavigated(FrameImpl frame) {
+    listeners.notify(EventType.FRAMENAVIGATED, frame);
+  }
+
+  @Override
+  public void onPageClose(Consumer<Page> handler) {
+    listeners.add(EventType.PAGECLOSE, handler);
+  }
+
+  @Override
+  public void offPageClose(Consumer<Page> handler) {
+    listeners.remove(EventType.PAGECLOSE, handler);
+  }
+
+  void notifyPageClose(PageImpl page) {
+    listeners.notify(EventType.PAGECLOSE, page);
+  }
+
+  @Override
+  public void onPageLoad(Consumer<Page> handler) {
+    listeners.add(EventType.PAGELOAD, handler);
+  }
+
+  @Override
+  public void offPageLoad(Consumer<Page> handler) {
+    listeners.remove(EventType.PAGELOAD, handler);
+  }
+
+  void notifyPageLoad(PageImpl page) {
+    listeners.notify(EventType.PAGELOAD, page);
+  }
+
   @Override
   public void onWebError(Consumer<WebError> handler) {
     listeners.add(EventType.WEBERROR, handler);
@@ -236,6 +315,11 @@ public ClockImpl clock() {
     return clock;
   }
 
+  @Override
+  public Credentials credentials() {
+    return credentials;
+  }
+
   private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
     List<Waitable<T>> waitables = new ArrayList<>();
     waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
@@ -272,6 +356,11 @@ public CDPSession newCDPSession(Frame frame) {
     return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
   }
 
+  @Override
+  public boolean isClosed() {
+    return closingOrClosed;
+  }
+
   @Override
   public void close(CloseOptions options) {
     if (!closingOrClosed) {
@@ -281,27 +370,7 @@ public void close(CloseOptions options) {
       }
       closeReason = options.reason;
       request.dispose(convertType(options, APIRequestContext.DisposeOptions.class));
-      for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
-        JsonObject params = new JsonObject();
-        params.addProperty("harId", entry.getKey());
-        JsonObject json = sendMessage("harExport", params, NO_TIMEOUT).getAsJsonObject();
-        ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
-        // Server side will compress artifact if content is attach or if file is .zip.
-        HarRecorder harParams = entry.getValue();
-        boolean isCompressed = harParams.contentPolicy == HarContentPolicy.ATTACH || harParams.path.toString().endsWith(".zip");
-        boolean needCompressed = harParams.path.toString().endsWith(".zip");
-        if (isCompressed && !needCompressed) {
-          String tmpPath = harParams.path + ".tmp";
-          artifact.saveAs(Paths.get(tmpPath));
-          JsonObject unzipParams = new JsonObject();
-          unzipParams.addProperty("zipFile", tmpPath);
-          unzipParams.addProperty("harFile", harParams.path.toString());
-          connection.localUtils.sendMessage("harUnzip", unzipParams, NO_TIMEOUT);
-        } else {
-          artifact.saveAs(harParams.path);
-        }
-        artifact.delete();
-      }
+      tracing.exportAllHars();
       JsonObject params = gson().toJsonTree(options).getAsJsonObject();
       sendMessage("close", params, NO_TIMEOUT);
     }
@@ -322,17 +391,18 @@ public void addCookies(List<Cookie> cookies) {
   }
 
   @Override
-  public void addInitScript(String script) {
+  public AutoCloseable addInitScript(String script) {
     JsonObject params = new JsonObject();
     params.addProperty("source", script);
-    sendMessage("addInitScript", params, NO_TIMEOUT);
+    JsonObject result = sendMessage("addInitScript", params, NO_TIMEOUT).getAsJsonObject();
+    return connection.getExistingObject(result.getAsJsonObject("disposable").get("guid").getAsString());
   }
 
   @Override
-  public void addInitScript(Path path) {
+  public AutoCloseable addInitScript(Path path) {
     try {
       byte[] bytes = readAllBytes(path);
-      addInitScript(new String(bytes, UTF_8));
+      return addInitScript(new String(bytes, UTF_8));
     } catch (IOException e) {
       throw new PlaywrightException("Failed to read script from file", e);
     }
@@ -340,7 +410,7 @@ public void addInitScript(Path path) {
 
   @Override
   public List<Page> backgroundPages() {
-    return new ArrayList<>(backgroundPages);
+    return Collections.emptyList();
   }
 
   @Override
@@ -388,11 +458,11 @@ public List<Cookie> cookies(List<String> urls) {
   }
 
   @Override
-  public void exposeBinding(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
-    exposeBindingImpl(name, playwrightBinding, options);
+  public AutoCloseable exposeBinding(String name, BindingCallback playwrightBinding) {
+    return exposeBindingImpl(name, playwrightBinding);
   }
 
-  private void exposeBindingImpl(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
+  private AutoCloseable exposeBindingImpl(String name, BindingCallback playwrightBinding) {
     if (bindings.containsKey(name)) {
       throw new PlaywrightException("Function \"" + name + "\" has been already registered");
     }
@@ -405,15 +475,13 @@ private void exposeBindingImpl(String name, BindingCallback playwrightBinding, E
 
     JsonObject params = new JsonObject();
     params.addProperty("name", name);
-    if (options != null && options.handle != null && options.handle) {
-      params.addProperty("needsHandle", true);
-    }
-    sendMessage("exposeBinding", params, NO_TIMEOUT);
+    JsonObject result = sendMessage("exposeBinding", params, NO_TIMEOUT).getAsJsonObject();
+    return connection.getExistingObject(result.getAsJsonObject("disposable").get("guid").getAsString());
   }
 
   @Override
-  public void exposeFunction(String name, FunctionCallback playwrightFunction) {
-    exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null);
+  public AutoCloseable exposeFunction(String name, FunctionCallback playwrightFunction) {
+    return exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args));
   }
 
   @Override
@@ -449,18 +517,21 @@ public APIRequestContextImpl request() {
   }
 
   @Override
-  public void route(String url, Consumer<Route> handler, RouteOptions options) {
+  public AutoCloseable route(String url, Consumer<Route> handler, RouteOptions options) {
     route(UrlMatcher.forGlob(baseUrl(), url, this.connection.localUtils, false), handler, options);
+    return new DisposableStub(() -> unroute(url, handler));
   }
 
   @Override
-  public void route(Pattern url, Consumer<Route> handler, RouteOptions options) {
+  public AutoCloseable route(Pattern url, Consumer<Route> handler, RouteOptions options) {
     route(new UrlMatcher(url), handler, options);
+    return new DisposableStub(() -> unroute(url, handler));
   }
 
   @Override
-  public void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options) {
+  public AutoCloseable route(Predicate<String> url, Consumer<Route> handler, RouteOptions options) {
     route(new UrlMatcher(url), handler, options);
+    return new DisposableStub(() -> unroute(url, handler));
   }
 
   @Override
@@ -507,24 +578,7 @@ void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options, HarCont
     if (contentPolicy == null) {
       contentPolicy = Utils.convertType(options.updateContent, HarContentPolicy.class);
     }
-    if (contentPolicy == null) {
-      contentPolicy = HarContentPolicy.ATTACH;
-    }
-
-    JsonObject params = new JsonObject();
-    if (page != null) {
-      params.add("page", page.toProtocolRef());
-    }
-    JsonObject recordHarArgs = new JsonObject();
-    recordHarArgs.addProperty("zip", har.toString().endsWith(".zip"));
-    recordHarArgs.addProperty("content", contentPolicy.name().toLowerCase());
-    recordHarArgs.addProperty("mode", (options.updateMode == null ? HarMode.MINIMAL : options.updateMode).name().toLowerCase());
-    addHarUrlFilter(recordHarArgs, options.url);
-
-    params.add("options", recordHarArgs);
-    JsonObject json = sendMessage("harStart", params, NO_TIMEOUT).getAsJsonObject();
-    String harId = json.get("harId").getAsString();
-    harRecorders.put(harId, new HarRecorder(har, contentPolicy));
+    tracing.recordIntoHar(page, har, options.url, contentPolicy, options.updateMode, null);
   }
 
   @Override
@@ -567,6 +621,18 @@ public void setOffline(boolean offline) {
     sendMessage("setOffline", params, NO_TIMEOUT);
   }
 
+  @Override
+  public void setStorageState(Path storageState) {
+    try {
+      String state = new String(readAllBytes(storageState), UTF_8);
+      JsonObject params = new JsonObject();
+      params.addProperty("storageState", state);
+      sendMessage("setStorageState", params, NO_TIMEOUT);
+    } catch (IOException e) {
+      throw new PlaywrightException("Failed to read storage state from file", e);
+    }
+  }
+
   @Override
   public String storageState(StorageStateOptions options) {
     if (options == null) {
@@ -583,6 +649,11 @@ public String storageState(StorageStateOptions options) {
     return storageState;
   }
 
+  @Override
+  public DebuggerImpl debugger() {
+    return debugger;
+  }
+
   @Override
   public TracingImpl tracing() {
     return tracing;
@@ -719,10 +790,6 @@ protected void handleEvent(String event, JsonObject params) {
       if (page.opener() != null && !page.opener().isClosed()) {
         page.opener().notifyPopup(page);
       }
-    } else if ("backgroundPage".equals(event)) {
-      PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-      backgroundPages.add(page);
-      listeners.notify(EventType.BACKGROUNDPAGE, page);
     } else if ("bindingCall".equals(event)) {
       BindingCall bindingCall = connection.getExistingObject(params.getAsJsonObject("binding").get("guid").getAsString());
       BindingCallback binding = bindings.get(bindingCall.name());
@@ -734,8 +801,15 @@ protected void handleEvent(String event, JsonObject params) {
       if (params.has("page")) {
         page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
       }
-      ConsoleMessageImpl message = new ConsoleMessageImpl(connection, params, page);
+      WorkerImpl worker = null;
+      if (params.has("worker")) {
+        worker = connection.getExistingObject(params.getAsJsonObject("worker").get("guid").getAsString());
+      }
+      ConsoleMessageImpl message = new ConsoleMessageImpl(connection, params, page, worker);
       listeners.notify(BrowserContextImpl.EventType.CONSOLE, message);
+      if (worker != null) {
+        worker.listeners.notify(WorkerImpl.EventType.CONSOLE, message);
+      }
       if (page != null) {
         page.listeners.notify(PageImpl.EventType.CONSOLE, message);
       }
@@ -776,7 +850,7 @@ protected void handleEvent(String event, JsonObject params) {
       }
     } else if ("response".equals(event)) {
       String guid = params.getAsJsonObject("response").get("guid").getAsString();
-      Response response = connection.getExistingObject(guid);
+      ResponseImpl response = connection.getExistingObject(guid);
       listeners.notify(EventType.RESPONSE, response);
       if (params.has("page")) {
         PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
@@ -790,7 +864,11 @@ protected void handleEvent(String event, JsonObject params) {
       } catch (PlaywrightException e) {
         page = null;
       }
-      listeners.notify(BrowserContextImpl.EventType.WEBERROR, new WebErrorImpl(page, errorStr));
+      WebErrorLocation location = null;
+      if (params.has("location")) {
+        location = gson().fromJson(params.getAsJsonObject("location"), WebErrorLocation.class);
+      }
+      listeners.notify(BrowserContextImpl.EventType.WEBERROR, new WebErrorImpl(page, errorStr, location));
       if (page != null) {
         page.listeners.notify(PageImpl.EventType.PAGEERROR, errorStr);
       }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java
index 795ccb2cb..f5236750c 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java
@@ -20,6 +20,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.BindResult;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -42,6 +43,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
   String closeReason;
 
   enum EventType {
+    CONTEXT,
     DISCONNECTED,
   }
 
@@ -49,6 +51,16 @@ enum EventType {
     super(parent, type, guid, initializer);
   }
 
+  @Override
+  public void onContext(Consumer<BrowserContext> handler) {
+    listeners.add(EventType.CONTEXT, handler);
+  }
+
+  @Override
+  public void offContext(Consumer<BrowserContext> handler) {
+    listeners.remove(EventType.CONTEXT, handler);
+  }
+
   @Override
   public void onDisconnected(Consumer<Browser> handler) {
     listeners.add(EventType.DISCONNECTED, handler);
@@ -195,6 +207,32 @@ public void startTracing(Page page, StartTracingOptions options) {
     sendMessage("startTracing", params, NO_TIMEOUT);
   }
 
+  @Override
+  public BindResult bind(String title, BindOptions options) {
+    JsonObject params = new JsonObject();
+    params.addProperty("title", title);
+    if (options != null) {
+      if (options.host != null) {
+        params.addProperty("host", options.host);
+      }
+      if (options.port != null) {
+        params.addProperty("port", options.port);
+      }
+      if (options.workspaceDir != null) {
+        params.addProperty("workspaceDir", options.workspaceDir);
+      }
+    }
+    JsonObject result = sendMessage("startServer", params, NO_TIMEOUT).getAsJsonObject();
+    BindResult bindResult = new BindResult();
+    bindResult.endpoint = result.get("endpoint").getAsString();
+    return bindResult;
+  }
+
+  @Override
+  public void unbind() {
+    sendMessage("stopServer", new JsonObject(), NO_TIMEOUT);
+  }
+
   @Override
   public byte[] stopTracing() {
     JsonObject json = sendMessage("stopTracing").getAsJsonObject();
@@ -275,6 +313,7 @@ private void didCreateContext(BrowserContextImpl context) {
       context.tracing().setTracesDir(tracePath);
       browserType.playwright.selectors.contextsForSelectors.add(context);
     }
+    listeners.notify(EventType.CONTEXT, context);
   }
 
   private void didClose() {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java
index 47f85a097..03efeab7c 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java
@@ -59,7 +59,7 @@ public Browser connect(String wsEndpoint, ConnectOptions options) {
     }
     // We don't use gson() here as the headers map should be serialized to a json object.
     JsonObject params = new Gson().toJsonTree(options).getAsJsonObject();
-    params.addProperty("wsEndpoint", wsEndpoint);
+    params.addProperty("endpoint", wsEndpoint);
 
     if (!params.has("headers")) {
       params.add("headers", new JsonObject());
@@ -112,8 +112,8 @@ public Browser connect(String wsEndpoint, ConnectOptions options) {
 
   @Override
   public Browser connectOverCDP(String endpointURL, ConnectOverCDPOptions options) {
-    if (!"chromium".equals(name())) {
-      throw new PlaywrightException("Connecting over CDP is only supported in Chromium.");
+    if (!"chromium".equals(name()) && !"webkit".equals(name())) {
+      throw new PlaywrightException("Connecting over CDP is only supported in Chromium and WebKit.");
     }
     if (options == null) {
       options = new ConnectOverCDPOptions();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/CDPSessionImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/CDPSessionImpl.java
index 8db1cd38c..24afe0726 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/CDPSessionImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/CDPSessionImpl.java
@@ -25,6 +25,11 @@
 
 public class CDPSessionImpl extends ChannelOwner implements CDPSession {
   private final ListenerCollection<String> listeners = new ListenerCollection<>(new HashMap<>(), this);
+  private final ListenerCollection<EventType> typedListeners = new ListenerCollection<>(new HashMap<>(), this);
+
+  enum EventType {
+    CLOSE,
+  }
 
   protected CDPSessionImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
@@ -40,9 +45,22 @@ void handleEvent(String event, JsonObject parameters) {
         params = parameters.get("params").getAsJsonObject();
       }
       listeners.notify(method, params);
+      listeners.notify("event", parameters);
+    } else if ("close".equals(event)) {
+      typedListeners.notify(EventType.CLOSE, this);
     }
   }
 
+  @Override
+  public void onClose(Consumer<CDPSession> handler) {
+    typedListeners.add(EventType.CLOSE, handler);
+  }
+
+  @Override
+  public void offClose(Consumer<CDPSession> handler) {
+    typedListeners.remove(EventType.CLOSE, handler);
+  }
+
   public JsonObject send(String method) {
     return send(method, null);
   }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java b/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
index ce68ad523..a626bfc02 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
@@ -110,6 +110,14 @@ WaitableResult<JsonElement> sendMessageAsync(String method, JsonObject params) {
     return connection.sendMessageAsync(guid, method, params);
   }
 
+  // Fire-and-forget: silently drop if the object was collected.
+  void sendMessageNoReply(String method, JsonObject params) {
+    if (wasCollected) {
+      return;
+    }
+    connection.sendMessageNoReply(guid, method, params);
+  }
+
   JsonElement sendMessage(String method) {
     return sendMessage(method, new JsonObject(), NO_TIMEOUT);
   }
@@ -117,11 +125,12 @@ JsonElement sendMessage(String method) {
   JsonElement sendMessage(String method, JsonObject params, Double timeout) {
     checkNotCollected();
     if (timeout != null) {
-      params.addProperty("timeout", timeout);
+      // Timeout is passed in the message metadata, remove potential leftover from serialized options.
+      params.remove("timeout");
     } else if (params.has("timeout")) {
       throw new PlaywrightException("Internal error: timeout must be passed explicitly.");
     }
-    return connection.sendMessage(guid, method, params);
+    return connection.sendMessage(guid, method, params, timeout);
   }
 
   private void checkNotCollected() {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Connection.java b/playwright/src/main/java/com/microsoft/playwright/impl/Connection.java
index c79dbdf8e..b0bc2bd37 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/Connection.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/Connection.java
@@ -39,6 +39,7 @@ class Message {
   JsonObject params;
   JsonElement result;
   SerializedError error;
+  JsonObject errorDetails;
   JsonArray log;
 
   @Override
@@ -128,17 +129,28 @@ void close() throws IOException {
   }
 
   public JsonElement sendMessage(String guid, String method, JsonObject params) {
-    return root.runUntil(() -> {}, sendMessageAsync(guid, method, params));
+    return sendMessage(guid, method, params, null);
+  }
+
+  public JsonElement sendMessage(String guid, String method, JsonObject params, Double timeout) {
+    return root.runUntil(() -> {}, internalSendMessage(guid, method, params, timeout, true, true));
   }
 
   public WaitableResult<JsonElement> sendMessageAsync(String guid, String method, JsonObject params) {
-    return internalSendMessage(guid, method, params, true);
+    return internalSendMessage(guid, method, params, null, true, true);
   }
 
-  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params, boolean sendStack) {
+  // Fire-and-forget: the server never replies.
+  public void sendMessageNoReply(String guid, String method, JsonObject params) {
+    internalSendMessage(guid, method, params, null, false, false);
+  }
+
+  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params, Double timeout, boolean sendStack, boolean expectsReply) {
     int id = ++lastId;
     WaitableResult<JsonElement> result = new WaitableResult<>();
-    callbacks.put(id, result);
+    if (expectsReply) {
+      callbacks.put(id, result);
+    }
     JsonObject message = new JsonObject();
     message.addProperty("id", id);
     message.addProperty("guid", guid);
@@ -146,6 +158,9 @@ private WaitableResult<JsonElement> internalSendMessage(String guid, String meth
     message.add("params", params);
     JsonObject metadata = new JsonObject();
     metadata.addProperty("wallTime", currentTimeMillis());
+    if (timeout != null) {
+      metadata.addProperty("timeout", timeout);
+    }
     JsonArray stack = null;
     if (titleReported) {
       metadata.addProperty("internal", true);
@@ -175,7 +190,7 @@ private WaitableResult<JsonElement> internalSendMessage(String guid, String meth
       callData.add("stack", stack);
       JsonObject stackParams = new JsonObject();
       stackParams.add("callData", callData);
-      internalSendMessage(localUtils.guid,"addStackToTracingNoReply", stackParams, false);
+      internalSendMessage(localUtils.guid,"addStackToTracingNoReply", stackParams, null, false, true);
     }
     return result;
   }
@@ -251,16 +266,20 @@ private void dispatch(Message message) {
         callback.complete(message.result);
       } else {
         String callLog = formatCallLog(message.log);
+        PlaywrightException exception;
         if (message.error.error == null) {
-          callback.completeExceptionally(new PlaywrightException(message.error + callLog));
+          exception = new PlaywrightException(message.error + callLog);
         } else if ("TimeoutError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TimeoutError(message.error.error + callLog));
+          exception = new TimeoutError(message.error.error + callLog);
         } else if ("TargetClosedError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TargetClosedError(message.error.error + callLog));
-
+          exception = new TargetClosedError(message.error.error + callLog);
         } else {
-          callback.completeExceptionally(new DriverException(message.error.error + callLog));
+          exception = new DriverException(message.error.error + callLog);
+        }
+        if (message.errorDetails != null) {
+          exception = new ServerErrorWithDetails(exception, message.errorDetails, message.log);
         }
+        callback.completeExceptionally(exception);
       }
       return;
     }
@@ -333,6 +352,9 @@ private ChannelOwner createRemoteObject(String parentGuid, JsonObject params) {
       case "Dialog":
         result = new DialogImpl(parent, type, guid, initializer);
         break;
+      case "Disposable":
+        result = new DisposableObject(parent, type, guid, initializer);
+        break;
       case "Electron":
 //        result = new Playwright(parent, type, guid, initializer);
         break;
@@ -378,6 +400,9 @@ private ChannelOwner createRemoteObject(String parentGuid, JsonObject params) {
         break;
       case "SocksSupport":
         break;
+      case "Debugger":
+        result = new DebuggerImpl(parent, type, guid, initializer);
+        break;
       case "Tracing":
         result = new TracingImpl(parent, type, guid, initializer);
         break;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ConsoleMessageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ConsoleMessageImpl.java
index 9097027ae..dcfde77ca 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ConsoleMessageImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ConsoleMessageImpl.java
@@ -20,6 +20,7 @@
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
+import com.microsoft.playwright.Worker;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,18 +28,30 @@
 public class ConsoleMessageImpl implements ConsoleMessage {
   private final Connection connection;
   private final PageImpl page;
+  private final WorkerImpl worker;
   private final JsonObject initializer;
 
-  public ConsoleMessageImpl(Connection connection, JsonObject initializer, PageImpl page) {
+  public ConsoleMessageImpl(Connection connection, JsonObject initializer, PageImpl page, WorkerImpl worker) {
     this.connection = connection;
     this.page = page;
+    this.worker = worker;
     this.initializer = initializer;
   }
 
+  @Override
+  public double timestamp() {
+    return initializer.get("timestamp").getAsDouble();
+  }
+
   public String type() {
     return initializer.get("type").getAsString();
   }
 
+  @Override
+  public Worker worker() {
+    return worker;
+  }
+
   public String text() {
     return initializer.get("text").getAsString();
   }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/CredentialsImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/CredentialsImpl.java
new file mode 100644
index 000000000..aa68f4a7d
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/CredentialsImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.Credentials;
+import com.microsoft.playwright.options.VirtualCredential;
+
+import java.util.List;
+
+import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
+import static com.microsoft.playwright.impl.Serialization.gson;
+import static java.util.Arrays.asList;
+
+class CredentialsImpl implements Credentials {
+  private final BrowserContextImpl context;
+
+  CredentialsImpl(BrowserContextImpl context) {
+    this.context = context;
+  }
+
+  @Override
+  public void install() {
+    context.sendMessage("credentialsInstall", new JsonObject(), NO_TIMEOUT);
+  }
+
+  @Override
+  public VirtualCredential create(String rpId, CreateOptions options) {
+    JsonObject params = options == null ? new JsonObject() : gson().toJsonTree(options).getAsJsonObject();
+    params.addProperty("rpId", rpId);
+    JsonObject json = context.sendMessage("credentialsCreate", params, NO_TIMEOUT).getAsJsonObject();
+    return gson().fromJson(json.get("credential"), VirtualCredential.class);
+  }
+
+  @Override
+  public void delete(String id) {
+    JsonObject params = new JsonObject();
+    params.addProperty("id", id);
+    context.sendMessage("credentialsDelete", params, NO_TIMEOUT);
+  }
+
+  @Override
+  public List<VirtualCredential> get(GetOptions options) {
+    JsonObject params = options == null ? new JsonObject() : gson().toJsonTree(options).getAsJsonObject();
+    JsonObject json = context.sendMessage("credentialsGet", params, NO_TIMEOUT).getAsJsonObject();
+    return asList(gson().fromJson(json.getAsJsonArray("credentials"), VirtualCredential[].class));
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/DebuggerImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/DebuggerImpl.java
new file mode 100644
index 000000000..4bad327d1
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/DebuggerImpl.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.Debugger;
+import com.microsoft.playwright.options.Location;
+import com.microsoft.playwright.options.DebuggerPausedDetails;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.microsoft.playwright.impl.Serialization.gson;
+
+class DebuggerImpl extends ChannelOwner implements Debugger {
+  private final List<Runnable> pausedStateChangedHandlers = new ArrayList<>();
+  private DebuggerPausedDetails pausedDetails;
+
+  DebuggerImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
+  }
+
+  @Override
+  protected void handleEvent(String event, JsonObject params) {
+    if ("pausedStateChanged".equals(event)) {
+      if (params.has("pausedDetails") && !params.get("pausedDetails").isJsonNull()) {
+        pausedDetails = gson().fromJson(params.get("pausedDetails"), DebuggerPausedDetails.class);
+      } else {
+        pausedDetails = null;
+      }
+      for (Runnable handler : new ArrayList<>(pausedStateChangedHandlers)) {
+        handler.run();
+      }
+    }
+  }
+
+  @Override
+  public void onPausedStateChanged(Runnable handler) {
+    pausedStateChangedHandlers.add(handler);
+  }
+
+  @Override
+  public void offPausedStateChanged(Runnable handler) {
+    pausedStateChangedHandlers.remove(handler);
+  }
+
+  @Override
+  public DebuggerPausedDetails pausedDetails() {
+    return pausedDetails;
+  }
+
+  @Override
+  public void requestPause() {
+    sendMessage("requestPause", new JsonObject(), NO_TIMEOUT);
+  }
+
+  @Override
+  public void resume() {
+    sendMessage("resume", new JsonObject(), NO_TIMEOUT);
+  }
+
+  @Override
+  public void next() {
+    sendMessage("next", new JsonObject(), NO_TIMEOUT);
+  }
+
+  @Override
+  public void runTo(Location location) {
+    JsonObject params = gson().toJsonTree(location).getAsJsonObject();
+    sendMessage("runTo", params, NO_TIMEOUT);
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java
index ac470e48e..74d23dca9 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java
@@ -43,7 +43,11 @@ public void accept(String promptText) {
 
   @Override
   public void dismiss() {
-    sendMessage("dismiss");
+    try {
+      sendMessage("dismiss");
+    } catch (TargetClosedError e) {
+      // Swallow TargetClosedErrors for beforeunload dialogs.
+    }
   }
 
   @Override
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/DisposableObject.java b/playwright/src/main/java/com/microsoft/playwright/impl/DisposableObject.java
new file mode 100644
index 000000000..b4e16db10
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/DisposableObject.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+
+class DisposableObject extends ChannelOwner implements AutoCloseable {
+  DisposableObject(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
+  }
+
+  @Override
+  public void close() {
+    sendMessage("dispose", new JsonObject(), NO_TIMEOUT);
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/DisposableStub.java b/playwright/src/main/java/com/microsoft/playwright/impl/DisposableStub.java
new file mode 100644
index 000000000..83f396399
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/DisposableStub.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+class DisposableStub implements AutoCloseable {
+  private Runnable dispose;
+
+  DisposableStub(Runnable dispose) {
+    this.dispose = dispose;
+  }
+
+  @Override
+  public void close() {
+    if (dispose == null)
+      return;
+    Runnable d = dispose;
+    dispose = null;
+    d.run();
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java
index a8b6667bc..a9e293896 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java
@@ -38,6 +38,7 @@
 import static com.microsoft.playwright.impl.Utils.addFilePathUploadParams;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;
+import static com.microsoft.playwright.options.ScreenshotType.WEBP;
 
 public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
   private final FrameImpl frame;
@@ -278,6 +279,8 @@ public byte[] screenshot(ScreenshotOptions options) {
           String extension = fileName.substring(extStart).toLowerCase();
           if (".jpeg".equals(extension) || ".jpg".equals(extension)) {
             options.type = JPEG;
+          } else if (".webp".equals(extension)) {
+            options.type = WEBP;
           }
         }
       }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
index ac04719ab..9a94fdf86 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
@@ -229,15 +229,18 @@ public List<Frame> childFrames() {
 
   @Override
   public void click(String selector, ClickOptions options) {
-    clickImpl(selector, options);
+    clickImpl(selector, options, null);
   }
 
-  void clickImpl(String selector, ClickOptions options) {
+  void clickImpl(String selector, ClickOptions options, Integer steps) {
     if (options == null) {
       options = new ClickOptions();
     }
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     params.addProperty("selector", selector);
+    if (steps != null) {
+      params.addProperty("steps", steps);
+    }
     sendMessage("click", params, timeout(options.timeout));
   }
 
@@ -248,11 +251,18 @@ public String content() {
 
   @Override
   public void dblclick(String selector, DblclickOptions options) {
+    dblclickImpl(selector, options, null);
+  }
+
+  void dblclickImpl(String selector, DblclickOptions options, Integer steps) {
     if (options == null) {
       options = new DblclickOptions();
     }
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     params.addProperty("selector", selector);
+    if (steps != null) {
+      params.addProperty("steps", steps);
+    }
     sendMessage("dblclick", params, timeout(options.timeout));
   }
 
@@ -440,16 +450,19 @@ void hoverImpl(String selector, HoverOptions options) {
 
   @Override
   public void dragAndDrop(String source, String target, DragAndDropOptions options) {
-    dragAndDropImpl(source, target, options);
+    dragAndDropImpl(source, target, options, null);
   }
 
-  void dragAndDropImpl(String source, String target, DragAndDropOptions options) {
+  void dragAndDropImpl(String source, String target, DragAndDropOptions options, Integer steps) {
     if (options == null) {
       options = new DragAndDropOptions();
     }
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     params.addProperty("source", source);
     params.addProperty("target", target);
+    if (steps != null) {
+      params.addProperty("steps", steps);
+    }
     sendMessage("dragAndDrop", params, timeout(options.timeout));
   }
 
@@ -627,7 +640,7 @@ void pressImpl(String selector, String key, PressOptions options) {
     params.addProperty("key", key);
     sendMessage("press", params, timeout(options.timeout));
   }
-  
+
   @Override
   public List<String> selectOption(String selector, SelectOption[] values, SelectOptionOptions options) {
     return selectOptionImpl(selector, values, options);
@@ -1038,12 +1051,58 @@ int queryCount(String selector) {
     return result.get("value").getAsInt();
   }
 
-  void highlightImpl(String selector) {
+  void dropImpl(String selector, DropPayload payload, com.microsoft.playwright.Locator.DropOptions options) {
+    if (options == null) {
+      options = new com.microsoft.playwright.Locator.DropOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    params.addProperty("selector", selector);
+    params.addProperty("strict", true);
+    if (payload != null) {
+      if (payload.files != null) {
+        if (payload.files instanceof Path) {
+          addFilePathUploadParams(new Path[] { (Path) payload.files }, params, page.context());
+        } else if (payload.files instanceof Path[]) {
+          addFilePathUploadParams((Path[]) payload.files, params, page.context());
+        } else if (payload.files instanceof com.microsoft.playwright.options.FilePayload) {
+          checkFilePayloadSize(new com.microsoft.playwright.options.FilePayload[] { (com.microsoft.playwright.options.FilePayload) payload.files });
+          params.add("payloads", toJsonArray(new com.microsoft.playwright.options.FilePayload[] { (com.microsoft.playwright.options.FilePayload) payload.files }));
+        } else if (payload.files instanceof com.microsoft.playwright.options.FilePayload[]) {
+          checkFilePayloadSize((com.microsoft.playwright.options.FilePayload[]) payload.files);
+          params.add("payloads", toJsonArray((com.microsoft.playwright.options.FilePayload[]) payload.files));
+        } else {
+          throw new com.microsoft.playwright.PlaywrightException("Unsupported files type: " + payload.files.getClass());
+        }
+      }
+      if (payload.data != null) {
+        com.google.gson.JsonArray dataArray = new com.google.gson.JsonArray();
+        for (java.util.Map.Entry<String, String> entry : payload.data.entrySet()) {
+          JsonObject e = new JsonObject();
+          e.addProperty("mimeType", entry.getKey());
+          e.addProperty("value", entry.getValue());
+          dataArray.add(e);
+        }
+        params.add("data", dataArray);
+      }
+    }
+    sendMessage("drop", params, timeout(options.timeout));
+  }
+
+  void highlightImpl(String selector, String style) {
     JsonObject params = new JsonObject();
     params.addProperty("selector", selector);
+    if (style != null) {
+      params.addProperty("style", style);
+    }
     sendMessage("highlight", params, NO_TIMEOUT);
   }
 
+  void hideHighlightImpl(String selector) {
+    JsonObject params = new JsonObject();
+    params.addProperty("selector", selector);
+    sendMessage("hideHighlight", params, NO_TIMEOUT);
+  }
+
   protected void handleEvent(String event, JsonObject params) {
     if ("loadstate".equals(event)) {
       JsonElement add = params.get("add");
@@ -1053,6 +1112,7 @@ protected void handleEvent(String event, JsonObject params) {
         if (parentFrame == null && page != null) {
           if (state == LOAD) {
             page.listeners.notify(PageImpl.EventType.LOAD, page);
+            page.browserContext.notifyPageLoad(page);
           } else if (state == DOMCONTENTLOADED) {
             page.listeners.notify(PageImpl.EventType.DOMCONTENTLOADED, page);
           }
@@ -1094,8 +1154,17 @@ FrameExpectResult expect(String expression, FrameExpectOptions options, String t
   FrameExpectResult expect(String expression, FrameExpectOptions options) {
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     params.addProperty("expression", expression);
-    JsonElement json = sendMessage("expect", params, options.timeout);
-    FrameExpectResult result = gson().fromJson(json, FrameExpectResult.class);
+    FrameExpectResult result = new FrameExpectResult();
+    try {
+      sendMessage("expect", params, options.timeout);
+      result.matches = !options.isNot;
+    } catch (ServerErrorWithDetails e) {
+      FrameExpectErrorDetails details = gson().fromJson(e.errorDetails(), FrameExpectErrorDetails.class);
+      result.matches = options.isNot;
+      result.received = details.received;
+      result.errorMessage = details.customErrorMessage == null ? null : "Error: " + details.customErrorMessage;
+      result.log = e.log();
+    }
     return result;
   }
 }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/HARRouter.java b/playwright/src/main/java/com/microsoft/playwright/impl/HARRouter.java
index 0318d5956..c932cc99c 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/HARRouter.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/HARRouter.java
@@ -16,6 +16,8 @@
 
 package com.microsoft.playwright.impl;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.Request;
@@ -82,7 +84,7 @@ void handle(Route route) {
       if (status == -1) {
         return;
       }
-      Map<String, String> headers = fromNameValues(response.getAsJsonArray("headers"));
+      Map<String, String> headers = mergeSetCookieHeaders(response.getAsJsonArray("headers"));
       byte[] buffer = Base64.getDecoder().decode(response.get("body").getAsString());
       route.fulfill(new Route.FulfillOptions()
         .setStatus(status)
@@ -105,6 +107,25 @@ void handle(Route route) {
     route.abort();
   }
 
+  private static Map<String, String> mergeSetCookieHeaders(JsonArray headersArray) {
+    Map<String, String> result = new java.util.LinkedHashMap<>();
+    for (JsonElement element : headersArray) {
+      JsonObject pair = element.getAsJsonObject();
+      String name = pair.get("name").getAsString();
+      String value = pair.get("value").getAsString();
+      if ("set-cookie".equalsIgnoreCase(name)) {
+        if (!result.containsKey("set-cookie")) {
+          result.put("set-cookie", value);
+        } else {
+          result.put("set-cookie", result.get("set-cookie") + "\n" + value);
+        }
+      } else {
+        result.put(name, value);
+      }
+    }
+    return result;
+  }
+
   void dispose() {
     JsonObject params = new JsonObject();
     params.addProperty("harId", harId);
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LocalUtils.java b/playwright/src/main/java/com/microsoft/playwright/impl/LocalUtils.java
index cea510eee..782089aad 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/LocalUtils.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/LocalUtils.java
@@ -34,13 +34,20 @@ JsonArray deviceDescriptors() {
     return initializer.getAsJsonArray("deviceDescriptors");
   }
 
-  void zip(Path zipFile, JsonArray entries, String stacksId, boolean appendMode, boolean includeSources) {
+  void zip(Path zipFile, JsonArray entries, String stacksId, boolean appendMode, boolean includeSources, List<String> additionalSources) {
     JsonObject params = new JsonObject();
     params.addProperty("zipFile", zipFile.toString());
     params.add("entries", entries);
     params.addProperty("mode", appendMode ? "append" : "write");
     params.addProperty("stacksId", stacksId);
     params.addProperty("includeSources", includeSources);
+    if (!additionalSources.isEmpty()) {
+      JsonArray sourcesArray = new JsonArray();
+      for (String source : additionalSources) {
+        sourcesArray.add(source);
+      }
+      params.add("additionalSources", sourcesArray);
+    }
     sendMessage("zip", params, NO_TIMEOUT);
   }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java
index 7c182ad3c..38dc949b9 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright.impl;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
 import com.microsoft.playwright.options.*;
@@ -25,10 +24,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiFunction;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.impl.LocatorUtils.*;
 import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Serialization.serializeArgument;
 import static com.microsoft.playwright.impl.Utils.convertType;
 
 class LocatorImpl implements Locator {
@@ -108,6 +109,14 @@ public List<String> allTextContents() {
     return (List<String>) frame.evalOnSelectorAll(selector, "ee => ee.map(e => e.textContent || '')");
   }
 
+  @Override
+  public Locator normalize() {
+    JsonObject params = new JsonObject();
+    params.addProperty("selector", selector);
+    JsonObject result = frame.sendMessage("resolveSelector", params, ChannelOwner.NO_TIMEOUT).getAsJsonObject();
+    return new LocatorImpl(frame, result.get("resolvedSelector").getAsString(), null);
+  }
+
   @Override
   public Locator and(Locator locator) {
     LocatorImpl other = (LocatorImpl) locator;
@@ -161,7 +170,7 @@ public void click(ClickOptions options) {
     if (options == null) {
       options = new ClickOptions();
     }
-    frame.click(selector, convertType(options, Frame.ClickOptions.class).setStrict(true));
+    frame.clickImpl(selector, convertType(options, Frame.ClickOptions.class).setStrict(true), options.steps);
   }
 
   @Override
@@ -174,12 +183,33 @@ public Locator describe(String description) {
     return locator(describeSelector(description));
   }
 
+  @Override
+  public String description() {
+    // Match internal:describe= at the end of the selector with a JSON string
+    // Pattern matches: >> internal:describe="..." where ... is a JSON-encoded string
+    Pattern pattern = Pattern.compile(" >> internal:describe=(\"(?:[^\"\\\\]|\\\\.)*\")$");
+    Matcher matcher = pattern.matcher(selector);
+
+    if (matcher.find()) {
+      String jsonString = matcher.group(1);
+      try {
+        // Deserialize the JSON string
+        return gson().fromJson(jsonString, String.class);
+      } catch (Exception e) {
+        // If we can't parse it, return null
+        return null;
+      }
+    }
+
+    return null;
+  }
+
   @Override
   public void dblclick(DblclickOptions options) {
     if (options == null) {
       options = new DblclickOptions();
     }
-    frame.dblclick(selector, convertType(options, Frame.DblclickOptions.class).setStrict(true));
+    frame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class).setStrict(true), options.steps);
   }
 
   @Override
@@ -197,7 +227,7 @@ public void dragTo(Locator target, DragToOptions options) {
     }
     Frame.DragAndDropOptions frameOptions = convertType(options, Frame.DragAndDropOptions.class);
     frameOptions.setStrict(true);
-    frame.dragAndDrop(selector, ((LocatorImpl) target).selector, frameOptions);
+    frame.dragAndDropImpl(selector, ((LocatorImpl) target).selector, frameOptions, options.steps);
   }
 
   @Override
@@ -342,8 +372,20 @@ public Locator getByTitle(Pattern text, GetByTitleOptions options) {
   }
 
   @Override
-  public void highlight() {
-    frame.highlightImpl(selector);
+  public void drop(DropPayload payload, DropOptions options) {
+    frame.dropImpl(selector, payload, options);
+  }
+
+  @Override
+  public AutoCloseable highlight(HighlightOptions options) {
+    String style = options == null ? null : options.style;
+    frame.highlightImpl(selector, style);
+    return new DisposableStub(this::hideHighlight);
+  }
+
+  @Override
+  public void hideHighlight() {
+    frame.hideHighlightImpl(selector);
   }
 
   @Override
@@ -625,8 +667,22 @@ public void waitFor(WaitForOptions options) {
     frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true);
   }
 
+  @Override
+  public void waitForFunction(String expression, Object arg, WaitForFunctionOptions options) {
+    JsonObject params = new JsonObject();
+    params.addProperty("selector", selector);
+    params.addProperty("strict", true);
+    params.addProperty("expression", expression);
+    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
+    frame.sendMessage("waitForFunction", params, frame.timeout(options == null ? null : options.timeout));
+  }
+
   @Override
   public String toString() {
+    String description = description();
+    if (description != null) {
+      return description;
+    }
     return "Locator@" + selector;
   }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorUtils.java b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorUtils.java
index cbfb2c7f7..8d9c025cd 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorUtils.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorUtils.java
@@ -43,8 +43,14 @@ static String describeSelector(String description) {
     return "internal:describe=" + gson().toJson(description);
   }
 
+  // Multiple test id attribute names can be joined with a comma. Attribute names cannot contain commas.
+  private static String encodeTestIdAttributeName(String testIdAttributeName) {
+    return testIdAttributeName.contains(",") ? gson().toJson(testIdAttributeName) : testIdAttributeName;
+  }
+
   static String getByTestIdSelector(Object testId, PlaywrightImpl playwright) {
-    return getByAttributeTextSelector(playwright.selectors.testIdAttributeName, testId, true);
+    String attributeName = encodeTestIdAttributeName(playwright.selectors.testIdAttributeName);
+    return "internal:testid=[" + attributeName + "=" + escapeForAttributeSelector(testId, true) + "]";
   }
 
   static String getByAltTextSelector(Object text, Locator.GetByAltTextOptions options) {
@@ -86,6 +92,10 @@ static String getByRoleSelector(AriaRole role, Locator.GetByRoleOptions options)
         String name = escapeForAttributeSelector(options.name, options.exact != null && options.exact);
         addAttr(result, "name", name);
       }
+      if (options.description != null) {
+        String description = escapeForAttributeSelector(options.description, options.exact != null && options.exact);
+        addAttr(result, "description", description);
+      }
       if (options.pressed != null)
         addAttr(result, "pressed", options.pressed.toString());
     }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageAssertionsImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageAssertionsImpl.java
index 9a114f249..2cdd63d17 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/PageAssertionsImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageAssertionsImpl.java
@@ -73,6 +73,16 @@ public void hasURL(Pattern pattern, HasURLOptions options) {
     expectImpl("to.have.url", expected, pattern, "Page URL expected to match regex", convertType(options, FrameExpectOptions.class), "Assert \"hasURL\"");
   }
 
+  @Override
+  public void matchesAriaSnapshot(String expected, MatchesAriaSnapshotOptions snapshotOptions) {
+    if (snapshotOptions == null) {
+      snapshotOptions = new MatchesAriaSnapshotOptions();
+    }
+    FrameExpectOptions options = convertType(snapshotOptions, FrameExpectOptions.class);
+    options.expectedValue = Serialization.serializeArgument(expected);
+    expectImpl("to.match.aria", options, expected, "Page expected to match Aria snapshot", "Assert \"matchesAriaSnapshot\"");
+  }
+
   @Override
   public PageAssertions not() {
     return new PageAssertionsImpl(actualPage, !isNot);
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
index de73ffae3..aca2c8370 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
@@ -35,17 +35,21 @@
 import static com.microsoft.playwright.impl.Utils.*;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;
+import static com.microsoft.playwright.options.ScreenshotType.WEBP;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;
 
 
 public class PageImpl extends ChannelOwner implements Page {
-  private final BrowserContextImpl browserContext;
+  final BrowserContextImpl browserContext;
   private final FrameImpl mainFrame;
   private final KeyboardImpl keyboard;
   private final MouseImpl mouse;
   private final TouchscreenImpl touchscreen;
+  private final ScreencastImpl screencast;
+  private final WebStorageImpl localStorage;
+  private final WebStorageImpl sessionStorage;
   final Waitable<?> waitableClosedOrCrashed;
   private ViewportSize viewport;
   private final Router routes = new Router();
@@ -135,6 +139,9 @@ enum EventType {
     keyboard = new KeyboardImpl(this);
     mouse = new MouseImpl(this);
     touchscreen = new TouchscreenImpl(this);
+    screencast = new ScreencastImpl(this);
+    localStorage = new WebStorageImpl(this, "local");
+    sessionStorage = new WebStorageImpl(this, "session");
     frames.add(mainFrame);
     timeoutSettings = new TimeoutSettings(browserContext.timeoutSettings);
     waitableClosedOrCrashed = createWaitForCloseHelper();
@@ -143,6 +150,13 @@ enum EventType {
     } else {
       opener = null;
     }
+    if (initializer.has("video")) {
+      String artifactGuid = initializer.getAsJsonObject("video").get("guid").getAsString();
+      ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
+      video = new VideoImpl(this, artifact);
+    } else {
+      video = new VideoImpl(this);
+    }
   }
 
   @Override
@@ -162,6 +176,7 @@ protected void handleEvent(String event, JsonObject params) {
       ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
       DownloadImpl download = new DownloadImpl(this, artifact, params);
       listeners.notify(EventType.DOWNLOAD, download);
+      browserContext.notifyDownload(download);
     } else if ("fileChooser".equals(event)) {
       String guid = params.getAsJsonObject("element").get("guid").getAsString();
       ElementHandleImpl elementHandle = connection.getExistingObject(guid);
@@ -192,6 +207,7 @@ protected void handleEvent(String event, JsonObject params) {
         frame.parentFrame.childFrames.add(frame);
       }
       listeners.notify(EventType.FRAMEATTACHED, frame);
+      browserContext.notifyFrameAttached(frame);
     } else if ("frameDetached".equals(event)) {
       String guid = params.getAsJsonObject("frame").get("guid").getAsString();
       FrameImpl frame = connection.getExistingObject(guid);
@@ -201,6 +217,7 @@ protected void handleEvent(String event, JsonObject params) {
         frame.parentFrame.childFrames.remove(frame);
       }
       listeners.notify(EventType.FRAMEDETACHED, frame);
+      browserContext.notifyFrameDetached(frame);
     } else if ("locatorHandlerTriggered".equals(event)) {
       int uid = params.get("uid").getAsInt();
       onLocatorHandlerTriggered(uid);
@@ -219,14 +236,12 @@ protected void handleEvent(String event, JsonObject params) {
       if (!webSocketRoutes.handle(route)) {
         browserContext.handleWebSocketRoute(route);
       }
-    } else if ("video".equals(event)) {
-      String artifactGuid = params.getAsJsonObject("artifact").get("guid").getAsString();
-      ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
-      forceVideo().setArtifact(artifact);
     } else if ("crash".equals(event)) {
       listeners.notify(EventType.CRASH, this);
     } else if ("close".equals(event)) {
       didClose();
+    } else if ("screencastFrame".equals(event)) {
+      screencast.handleScreencastFrame(params);
     }
   }
 
@@ -237,8 +252,8 @@ void notifyPopup(PageImpl popup) {
   void didClose() {
     isClosed = true;
     browserContext.pages.remove(this);
-    browserContext.backgroundPages.remove(this);
     listeners.notify(EventType.CLOSE, this);
+    browserContext.notifyPageClose(this);
   }
 
   private String effectiveCloseReason() {
@@ -545,8 +560,13 @@ public void close(CloseOptions options) {
     try {
       if (ownedContext != null) {
         ownedContext.close();
+      } else if (options.runBeforeUnload != null && options.runBeforeUnload) {
+        sendMessage("runBeforeUnload", new JsonObject(), NO_TIMEOUT);
       } else {
-        JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+        JsonObject params = new JsonObject();
+        if (options.reason != null) {
+          params.addProperty("reason", options.reason);
+        }
         sendMessage("close", params, NO_TIMEOUT);
       }
     } catch (PlaywrightException exception) {
@@ -634,6 +654,16 @@ private void onLocatorHandlerTriggered(int uid) {
     }
   }
 
+  @Override
+  public String ariaSnapshot(AriaSnapshotOptions options) {
+    if (options == null) {
+      options = new AriaSnapshotOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    JsonObject result = mainFrame.sendMessage("ariaSnapshot", params, mainFrame.timeout(options.timeout)).getAsJsonObject();
+    return result.get("snapshot").getAsString();
+  }
+
   @Override
   public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) {
     return mainFrame.evalOnSelectorImpl(
@@ -646,25 +676,26 @@ public Object evalOnSelectorAll(String selector, String pageFunction, Object arg
   }
 
   @Override
-  public void addInitScript(String script) {
-    addInitScriptImpl(script);
+  public AutoCloseable addInitScript(String script) {
+    return addInitScriptImpl(script);
   }
 
   @Override
-  public void addInitScript(Path path) {
+  public AutoCloseable addInitScript(Path path) {
     try {
       byte[] bytes = readAllBytes(path);
       String script = addSourceUrlToScript(new String(bytes, UTF_8), path);
-      addInitScriptImpl(script);
+      return addInitScriptImpl(script);
     } catch (IOException e) {
       throw new PlaywrightException("Failed to read script from file", e);
     }
   }
 
-  private void addInitScriptImpl(String script) {
+  private AutoCloseable addInitScriptImpl(String script) {
     JsonObject params = new JsonObject();
     params.addProperty("source", script);
-    sendMessage("addInitScript", params, NO_TIMEOUT);
+    JsonObject result = sendMessage("addInitScript", params, NO_TIMEOUT).getAsJsonObject();
+    return connection.getExistingObject(result.getAsJsonObject("disposable").get("guid").getAsString());
   }
 
   @Override
@@ -689,7 +720,7 @@ public void check(String selector, CheckOptions options) {
 
   @Override
   public void click(String selector, ClickOptions options) {
-    mainFrame.clickImpl(selector, convertType(options, Frame.ClickOptions.class));
+    mainFrame.clickImpl(selector, convertType(options, Frame.ClickOptions.class), null);
   }
 
   @Override
@@ -704,7 +735,7 @@ public BrowserContextImpl context() {
 
   @Override
   public void dblclick(String selector, DblclickOptions options) {
-    mainFrame.dblclick(selector, convertType(options, Frame.DblclickOptions.class));
+    mainFrame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class), null);
   }
 
   @Override
@@ -736,11 +767,11 @@ public JSHandle evaluateHandle(String pageFunction, Object arg) {
   }
 
   @Override
-  public void exposeBinding(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
-    exposeBindingImpl(name, playwrightBinding, options);
+  public AutoCloseable exposeBinding(String name, BindingCallback playwrightBinding) {
+    return exposeBindingImpl(name, playwrightBinding);
   }
 
-  private void exposeBindingImpl(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
+  private AutoCloseable exposeBindingImpl(String name, BindingCallback playwrightBinding) {
     if (bindings.containsKey(name)) {
       throw new PlaywrightException("Function \"" + name + "\" has been already registered");
     }
@@ -751,15 +782,13 @@ private void exposeBindingImpl(String name, BindingCallback playwrightBinding, E
 
     JsonObject params = new JsonObject();
     params.addProperty("name", name);
-    if (options != null && options.handle != null && options.handle) {
-      params.addProperty("needsHandle", true);
-    }
-    sendMessage("exposeBinding", params, NO_TIMEOUT);
+    JsonObject result = sendMessage("exposeBinding", params, NO_TIMEOUT).getAsJsonObject();
+    return connection.getExistingObject(result.getAsJsonObject("disposable").get("guid").getAsString());
   }
 
   @Override
-  public void exposeFunction(String name, FunctionCallback playwrightFunction) {
-    exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null);
+  public AutoCloseable exposeFunction(String name, FunctionCallback playwrightFunction) {
+    return exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args));
   }
 
   @Override
@@ -937,7 +966,10 @@ public void hover(String selector, HoverOptions options) {
 
   @Override
   public void dragAndDrop(String source, String target, DragAndDropOptions options) {
-    mainFrame.dragAndDropImpl(source, target, convertType(options, Frame.DragAndDropOptions.class));
+    if (options == null) {
+      options = new DragAndDropOptions();
+    }
+    mainFrame.dragAndDropImpl(source, target, convertType(options, Frame.DragAndDropOptions.class), options.steps);
   }
 
   @Override
@@ -996,16 +1028,27 @@ public Keyboard keyboard() {
   }
 
   @Override
-  public List<ConsoleMessage> consoleMessages() {
-    JsonObject json = sendMessage("consoleMessages", new JsonObject(), NO_TIMEOUT).getAsJsonObject();
+  public List<ConsoleMessage> consoleMessages(ConsoleMessagesOptions options) {
+    JsonObject params = options != null ? gson().toJsonTree(options).getAsJsonObject() : new JsonObject();
+    JsonObject json = sendMessage("consoleMessages", params, NO_TIMEOUT).getAsJsonObject();
     JsonArray messages = json.getAsJsonArray("messages");
     List<ConsoleMessage> result = new ArrayList<>();
     for (JsonElement item : messages) {
-      result.add(new ConsoleMessageImpl(connection, item.getAsJsonObject(), this));
+      result.add(new ConsoleMessageImpl(connection, item.getAsJsonObject(), this, null));
     }
     return result;
   }
 
+  @Override
+  public void clearConsoleMessages() {
+    sendMessage("clearConsoleMessages", new JsonObject(), NO_TIMEOUT);
+  }
+
+  @Override
+  public void clearPageErrors() {
+    sendMessage("clearPageErrors", new JsonObject(), NO_TIMEOUT);
+  }
+
   @Override
   public List<String> pageErrors() {
     JsonObject json = sendMessage("pageErrors", new JsonObject(), NO_TIMEOUT).getAsJsonObject();
@@ -1028,6 +1071,11 @@ public Frame mainFrame() {
     return mainFrame;
   }
 
+  @Override
+  public void hideHighlight() {
+    sendMessage("hideHighlight", new JsonObject(), NO_TIMEOUT);
+  }
+
   @Override
   public Mouse mouse() {
     return mouse;
@@ -1041,6 +1089,17 @@ public PageImpl opener() {
     return opener;
   }
 
+  @Override
+  public void cancelPickLocator() {
+    sendMessage("cancelPickLocator", new JsonObject(), NO_TIMEOUT);
+  }
+
+  @Override
+  public Locator pickLocator() {
+    JsonObject result = sendMessage("pickLocator", new JsonObject(), NO_TIMEOUT).getAsJsonObject();
+    return new LocatorImpl(mainFrame, result.get("selector").getAsString(), null);
+  }
+
   @Override
   public void pause() {
     TimeoutSettings settings = browserContext.timeoutSettings;
@@ -1103,18 +1162,21 @@ private Response reloadImpl(ReloadOptions options) {
   }
 
   @Override
-  public void route(String url, Consumer<Route> handler, RouteOptions options) {
+  public AutoCloseable route(String url, Consumer<Route> handler, RouteOptions options) {
     route(UrlMatcher.forGlob(browserContext.baseUrl(), url, this.connection.localUtils, false), handler, options);
+    return new DisposableStub(() -> unroute(url, handler));
   }
 
   @Override
-  public void route(Pattern url, Consumer<Route> handler, RouteOptions options) {
+  public AutoCloseable route(Pattern url, Consumer<Route> handler, RouteOptions options) {
     route(new UrlMatcher(url), handler, options);
+    return new DisposableStub(() -> unroute(url, handler));
   }
 
   @Override
-  public void route(Predicate<String> url, Consumer<Route> handler, RouteOptions options) {
+  public AutoCloseable route(Predicate<String> url, Consumer<Route> handler, RouteOptions options) {
     route(new UrlMatcher(url), handler, options);
+    return new DisposableStub(() -> unroute(url, handler));
   }
 
   @Override
@@ -1198,6 +1260,8 @@ private byte[] screenshotImpl(ScreenshotOptions options) {
           String extension = fileName.substring(extStart).toLowerCase();
           if (".jpeg".equals(extension) || ".jpg".equals(extension)) {
             options.type = JPEG;
+          } else if (".webp".equals(extension)) {
+            options.type = WEBP;
           }
         }
       }
@@ -1305,6 +1369,21 @@ public Touchscreen touchscreen() {
     return touchscreen;
   }
 
+  @Override
+  public Screencast screencast() {
+    return screencast;
+  }
+
+  @Override
+  public WebStorage localStorage() {
+    return localStorage;
+  }
+
+  @Override
+  public WebStorage sessionStorage() {
+    return sessionStorage;
+  }
+
   @Override
   public void type(String selector, String text, TypeOptions options) {
     mainFrame.type(selector, text, convertType(options, Frame.TypeOptions.class));
@@ -1355,22 +1434,9 @@ public String url() {
   }
 
 
-  private VideoImpl forceVideo() {
-    if (video == null) {
-      video = new VideoImpl(this);
-    }
-    return video;
-  }
-
   @Override
   public VideoImpl video() {
-    // Note: we are creating Video object lazily, because we do not know
-    // BrowserContextOptions when constructing the page - it is assigned
-    // too late during launchPersistentContext.
-    if (browserContext.videosDir() == null) {
-      return null;
-    }
-    return forceVideo();
+    return video;
   }
 
   @Override
@@ -1419,6 +1485,7 @@ private Response waitForNavigationImpl(Logger logger, Runnable code, WaitForNavi
 
   void frameNavigated(FrameImpl frame) {
     listeners.notify(EventType.FRAMENAVIGATED, frame);
+    browserContext.notifyFrameNavigated(frame);
   }
 
   private class WaitableFrameDetach extends WaitableEvent<EventType, Frame> {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java b/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java
index e3363f20a..b7e02eed2 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java
@@ -112,10 +112,20 @@ class FrameExpectOptions {
 }
 
 class FrameExpectResult {
+  static class Received {
+    SerializedValue value;
+    String ariaSnapshot;
+  }
   boolean matches;
-  SerializedValue received;
+  Received received;
   String errorMessage;
   List<String> log;
 }
 
+class FrameExpectErrorDetails {
+  FrameExpectResult.Received received;
+  Boolean timedOut;
+  String customErrorMessage;
+}
+
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java
index cc650ce8f..1d33a08b6 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java
@@ -42,6 +42,7 @@ public class RequestImpl extends ChannelOwner implements Request {
   String failure;
   Timing timing;
   boolean didFailOrFinish;
+  ResponseImpl existingResponse;
   private FallbackOverrides fallbackOverrides;
 
   static class FallbackOverrides {
@@ -66,6 +67,11 @@ static class FallbackOverrides {
     }
   }
 
+  @Override
+  public ResponseImpl existingResponse() {
+    return existingResponse;
+  }
+
   @Override
   public Map<String, String> allHeaders() {
     return getRawHeaders().headers();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java
index 40be3c548..b2f73fcf1 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java
@@ -36,12 +36,13 @@
 public class ResponseImpl extends ChannelOwner implements Response {
   private final RawHeaders headers;
   private RawHeaders rawHeaders;
-  private final RequestImpl request;
+  final RequestImpl request;
 
   ResponseImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
     headers = new RawHeaders(asList(gson().fromJson(initializer.getAsJsonArray("headers"), HttpHeader[].class)));
     request = connection.getExistingObject(initializer.getAsJsonObject("request").get("guid").getAsString());
+    request.existingResponse = this;
     request.timing = gson().fromJson(initializer.get("timing"), Timing.class);
   }
 
@@ -86,6 +87,12 @@ public boolean fromServiceWorker() {
     return initializer.get("fromServiceWorker").getAsBoolean();
   }
 
+  @Override
+  public String httpVersion() {
+    JsonObject result = sendMessage("httpVersion").getAsJsonObject();
+    return result.get("value").getAsString();
+  }
+
   @Override
   public Map<String, String> headers() {
     return headers.headers();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ScreencastFrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ScreencastFrameImpl.java
new file mode 100644
index 000000000..e70b5d51a
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ScreencastFrameImpl.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.microsoft.playwright.ScreencastFrame;
+
+class ScreencastFrameImpl implements ScreencastFrame {
+  private final byte[] data;
+  private final double timestamp;
+  private final int viewportWidth;
+  private final int viewportHeight;
+
+  ScreencastFrameImpl(byte[] data, double timestamp, int viewportWidth, int viewportHeight) {
+    this.data = data;
+    this.timestamp = timestamp;
+    this.viewportWidth = viewportWidth;
+    this.viewportHeight = viewportHeight;
+  }
+
+  @Override
+  public byte[] data() {
+    return data;
+  }
+
+  @Override
+  public double timestamp() {
+    return timestamp;
+  }
+
+  @Override
+  public int viewportWidth() {
+    return viewportWidth;
+  }
+
+  @Override
+  public int viewportHeight() {
+    return viewportHeight;
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ScreencastImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ScreencastImpl.java
new file mode 100644
index 000000000..aba7fcd91
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ScreencastImpl.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.Screencast;
+import com.microsoft.playwright.ScreencastFrame;
+
+import java.nio.file.Path;
+import java.util.function.Consumer;
+
+import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
+import static com.microsoft.playwright.impl.Serialization.gson;
+
+class ScreencastImpl implements Screencast {
+  private final PageImpl page;
+  private boolean started;
+  private Path savePath;
+  private Consumer<ScreencastFrame> onFrame;
+  private ArtifactImpl artifact;
+
+  ScreencastImpl(PageImpl page) {
+    this.page = page;
+  }
+
+  void handleScreencastFrame(JsonObject params) {
+    try {
+      if (onFrame != null) {
+        String dataBase64 = params.get("data").getAsString();
+        byte[] data = java.util.Base64.getDecoder().decode(dataBase64);
+        double timestamp = params.get("timestamp").getAsDouble();
+        int viewportWidth = params.get("viewportWidth").getAsInt();
+        int viewportHeight = params.get("viewportHeight").getAsInt();
+        onFrame.accept(new ScreencastFrameImpl(data, timestamp, viewportWidth, viewportHeight));
+      }
+    } finally {
+      // The server sends the next frame only after the previous one is acknowledged.
+      JsonObject ackParams = new JsonObject();
+      ackParams.add("frameId", params.get("frameId"));
+      page.sendMessageAsync("screencastFrameAck", ackParams);
+    }
+  }
+
+  @Override
+  public AutoCloseable start(StartOptions options) {
+    if (started) {
+      throw new PlaywrightException("Screencast is already started");
+    }
+    started = true;
+    JsonObject params = new JsonObject();
+    if (options != null) {
+      if (options.onFrame != null) {
+        onFrame = options.onFrame;
+      }
+      if (options.quality != null) {
+        params.addProperty("quality", options.quality);
+      }
+      params.addProperty("sendFrames", options.onFrame != null);
+      params.addProperty("record", options.path != null);
+      savePath = options.path;
+    } else {
+      params.addProperty("sendFrames", false);
+      params.addProperty("record", false);
+    }
+    JsonObject result = page.sendMessage("screencastStart", params, NO_TIMEOUT).getAsJsonObject();
+    if (result.has("artifact")) {
+      String artifactGuid = result.getAsJsonObject("artifact").get("guid").getAsString();
+      artifact = page.connection.getExistingObject(artifactGuid);
+    }
+    return new DisposableStub(this::stop);
+  }
+
+  @Override
+  public void stop() {
+    started = false;
+    onFrame = null;
+    page.sendMessage("screencastStop", new JsonObject(), NO_TIMEOUT);
+    if (savePath != null && artifact != null) {
+      artifact.saveAs(savePath);
+    }
+    artifact = null;
+    savePath = null;
+  }
+
+  @Override
+  public AutoCloseable showOverlay(String html, ShowOverlayOptions options) {
+    JsonObject params = new JsonObject();
+    params.addProperty("html", html);
+    if (options != null && options.duration != null) {
+      params.addProperty("duration", options.duration);
+    }
+    JsonObject result = (JsonObject) page.sendMessage("screencastShowOverlay", params, NO_TIMEOUT);
+    String id = result.get("id").getAsString();
+    return () -> {
+      JsonObject removeParams = new JsonObject();
+      removeParams.addProperty("id", id);
+      page.sendMessage("screencastRemoveOverlay", removeParams, NO_TIMEOUT);
+    };
+  }
+
+  @Override
+  public void showChapter(String title, ShowChapterOptions options) {
+    JsonObject params = new JsonObject();
+    params.addProperty("title", title);
+    if (options != null) {
+      if (options.description != null) {
+        params.addProperty("description", options.description);
+      }
+      if (options.duration != null) {
+        params.addProperty("duration", options.duration);
+      }
+    }
+    page.sendMessage("screencastChapter", params, NO_TIMEOUT);
+  }
+
+  @Override
+  public AutoCloseable showActions(ShowActionsOptions options) {
+    JsonObject params = new JsonObject();
+    if (options != null) {
+      if (options.duration != null) {
+        params.addProperty("duration", options.duration);
+      }
+      if (options.fontSize != null) {
+        params.addProperty("fontSize", options.fontSize);
+      }
+      if (options.position != null) {
+        params.add("position", gson().toJsonTree(options.position));
+      }
+    }
+    page.sendMessage("screencastShowActions", params, NO_TIMEOUT);
+    return new DisposableStub(this::hideActions);
+  }
+
+  @Override
+  public void showOverlays() {
+    JsonObject params = new JsonObject();
+    params.addProperty("visible", true);
+    page.sendMessage("screencastSetOverlayVisible", params, NO_TIMEOUT);
+  }
+
+  @Override
+  public void hideActions() {
+    page.sendMessage("screencastHideActions", new JsonObject(), NO_TIMEOUT);
+  }
+
+  @Override
+  public void hideOverlays() {
+    JsonObject params = new JsonObject();
+    params.addProperty("visible", false);
+    page.sendMessage("screencastSetOverlayVisible", params, NO_TIMEOUT);
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java b/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java
index b639887f9..f5b44c96c 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java
@@ -45,6 +45,7 @@ class Serialization {
     .registerTypeAdapter(Date.class, new DateSerializer())
     .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
     .registerTypeAdapter(SameSiteAttribute.class, new SameSiteAdapter().nullSafe())
+    .registerTypeAdapter(AnnotatePosition.class, new ToLowerCaseAndDashSerializer<AnnotatePosition>())
     .registerTypeAdapter(BrowserChannel.class, new ToLowerCaseAndDashSerializer<BrowserChannel>())
     .registerTypeAdapter(ColorScheme.class, new ToLowerCaseAndDashSerializer<ColorScheme>())
     .registerTypeAdapter(Contrast.class, new ToLowerCaseAndDashSerializer<Contrast>())
@@ -58,6 +59,9 @@ class Serialization {
     .registerTypeAdapter(ScreenshotCaret.class, new ToLowerCaseSerializer<ScreenshotCaret>())
     .registerTypeAdapter(ServiceWorkerPolicy.class, new ToLowerCaseAndDashSerializer<ServiceWorkerPolicy>())
     .registerTypeAdapter(MouseButton.class, new ToLowerCaseSerializer<MouseButton>())
+    .registerTypeAdapter(ScrollMode.class, new ToLowerCaseSerializer<ScrollMode>())
+    .registerTypeAdapter(ConsoleMessagesFilter.class, new ConsoleMessagesFilterSerializer())
+    .registerTypeAdapter(AriaSnapshotMode.class, new ToLowerCaseSerializer<AriaSnapshotMode>())
     .registerTypeAdapter(LoadState.class, new ToLowerCaseSerializer<LoadState>())
     .registerTypeAdapter(WaitUntilState.class, new ToLowerCaseSerializer<WaitUntilState>())
     .registerTypeAdapter(WaitForSelectorState.class, new ToLowerCaseSerializer<WaitForSelectorState>())
@@ -75,6 +79,7 @@ static Gson gson() {
 
   static final Gson jsonDataSerializer = new GsonBuilder().disableHtmlEscaping()
     .registerTypeAdapter(Date.class, new DateSerializer())
+    .registerTypeAdapter(LocalDate.class, new LocalDateSerializer())
     .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
     .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeSerializer())
     .serializeNulls().create();
@@ -482,6 +487,17 @@ public JsonElement serialize(Map<String, String> src, Type typeOfSrc, JsonSerial
     }
   }
 
+  private static class ConsoleMessagesFilterSerializer implements JsonSerializer<ConsoleMessagesFilter> {
+    @Override
+    public JsonElement serialize(ConsoleMessagesFilter src, Type typeOfSrc, JsonSerializationContext context) {
+      switch (src) {
+        case ALL: return new JsonPrimitive("all");
+        case SINCE_NAVIGATION: return new JsonPrimitive("since-navigation");
+        default: throw new PlaywrightException("Unknown ConsoleMessagesFilter: " + src);
+      }
+    }
+  }
+
   private static class ToLowerCaseAndDashSerializer<E extends Enum<E>> implements JsonSerializer<E> {
     @Override
     public JsonElement serialize(E src, Type typeOfSrc, JsonSerializationContext context) {
@@ -558,6 +574,15 @@ public JsonElement serialize(OffsetDateTime src, Type typeOfSrc, JsonSerializati
     }
   }
 
+  private static class LocalDateSerializer implements JsonSerializer<LocalDate> {
+    @Override
+    public JsonElement serialize(LocalDate src, Type typeOfSrc, JsonSerializationContext context) {
+      // LocalDate has no time or zone, so emit the ISO-8601 date (yyyy-MM-dd) as-is to
+      // avoid shifting the calendar date when converting through a time zone.
+      return new JsonPrimitive(src.toString());
+    }
+  }
+
   private static class LocalDateTimeSerializer implements JsonSerializer<LocalDateTime> {
     @Override
     public JsonElement serialize(LocalDateTime src, Type typeOfSrc, JsonSerializationContext context) {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ServerErrorWithDetails.java b/playwright/src/main/java/com/microsoft/playwright/impl/ServerErrorWithDetails.java
new file mode 100644
index 000000000..64bc19179
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ServerErrorWithDetails.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class ServerErrorWithDetails extends PlaywrightException {
+  private final JsonObject errorDetails;
+  private final JsonArray log;
+
+  ServerErrorWithDetails(PlaywrightException cause, JsonObject errorDetails, JsonArray log) {
+    super(cause.getMessage(), cause);
+    this.errorDetails = errorDetails;
+    this.log = log;
+  }
+
+  // Rethrown with the calling thread's stack trace, see WaitableResult.get().
+  ServerErrorWithDetails(ServerErrorWithDetails cause) {
+    super(cause.getMessage(), cause);
+    this.errorDetails = cause.errorDetails;
+    this.log = cause.log;
+  }
+
+  JsonObject errorDetails() {
+    return errorDetails;
+  }
+
+  List<String> log() {
+    List<String> result = new ArrayList<>();
+    if (log != null) {
+      for (JsonElement e : log) {
+        result.add(e.getAsString());
+      }
+    }
+    return result;
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
index 10db06c2d..7587b16f8 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
@@ -18,10 +18,21 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.Tracing;
+import com.microsoft.playwright.options.HarContentPolicy;
+import com.microsoft.playwright.options.HarMode;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
+import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
 
 class TracingImpl extends ChannelOwner implements Tracing {
@@ -29,6 +40,18 @@ class TracingImpl extends ChannelOwner implements Tracing {
   private Path tracesDir;
   private boolean isTracing;
   private String stacksId;
+  private final Set<String> additionalSources = new HashSet<>();
+  final Map<String, HarRecorder> harRecorders = new HashMap<>();
+
+  static class HarRecorder {
+    final Path path;
+    final HarContentPolicy contentPolicy;
+
+    HarRecorder(Path har, HarContentPolicy policy) {
+      this.path = har;
+      this.contentPolicy = policy;
+    }
+  }
 
 
   TracingImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
@@ -42,6 +65,9 @@ private void stopChunkImpl(Path path) {
     }
     JsonObject params = new JsonObject();
 
+    List<String> capturedAdditionalSources = new ArrayList<>(additionalSources);
+    additionalSources.clear();
+
     // Not interested in artifacts.
     if (path == null) {
       params.addProperty("mode", "discard");
@@ -57,7 +83,7 @@ private void stopChunkImpl(Path path) {
       params.addProperty("mode", "entries");
       JsonObject json = sendMessage("tracingStopChunk", params, NO_TIMEOUT).getAsJsonObject();
       JsonArray entries = json.getAsJsonArray("entries");
-      connection.localUtils.zip(path, entries, stacksId, false, includeSources);
+      connection.localUtils.zip(path, entries, stacksId, false, includeSources, capturedAdditionalSources);
       return;
     }
 
@@ -74,7 +100,7 @@ private void stopChunkImpl(Path path) {
     artifact.saveAs(path);
     artifact.delete();
 
-    connection.localUtils.zip(path, new JsonArray(), stacksId, true, includeSources);
+    connection.localUtils.zip(path, new JsonArray(), stacksId, true, includeSources, capturedAdditionalSources);
   }
 
   @Override
@@ -86,14 +112,18 @@ public void startChunk(StartChunkOptions options) {
   }
 
   @Override
-  public void group(String name, GroupOptions options) {
+  public AutoCloseable group(String name, GroupOptions options) {
     groupImpl(name, options);
+    return new DisposableStub(this::groupEnd);
   }
 
   private void groupImpl(String name, GroupOptions options) {
     if (options == null) {
       options = new GroupOptions();
     }
+    if (options.location != null) {
+      additionalSources.add(options.location.file);
+    }
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     params.addProperty("name", name);
     sendMessage("tracingGroup", params, NO_TIMEOUT);
@@ -149,6 +179,110 @@ public void stopChunk(StopChunkOptions options) {
     stopChunkImpl(options == null ? null : options.path);
   }
 
+  private String currentHarId;
+
+  @Override
+  public AutoCloseable startHar(Path path, StartHarOptions options) {
+    if (currentHarId != null) {
+      throw new PlaywrightException("HAR recording has already been started");
+    }
+    if (options == null) {
+      options = new StartHarOptions();
+    }
+    boolean isZip = path.toString().endsWith(".zip");
+    HarContentPolicy contentPolicy = options.content != null
+      ? options.content
+      : (isZip ? HarContentPolicy.ATTACH : HarContentPolicy.EMBED);
+    HarMode mode = options.mode != null ? options.mode : HarMode.FULL;
+    currentHarId = recordIntoHar(null, path, options.urlFilter, contentPolicy, mode, null);
+    return new DisposableStub(this::stopHar);
+  }
+
+  @Override
+  public void stopHar() {
+    if (currentHarId == null) {
+      throw new PlaywrightException("HAR recording has not been started");
+    }
+    String harId = currentHarId;
+    currentHarId = null;
+    exportHar(harId);
+  }
+
+  String recordIntoHar(PageImpl page, Path har, Object urlFilter, HarContentPolicy contentPolicy, HarMode mode, Path resourcesDir) {
+    if (contentPolicy == null) {
+      contentPolicy = HarContentPolicy.ATTACH;
+    }
+    if (mode == null) {
+      mode = HarMode.MINIMAL;
+    }
+
+    JsonObject params = new JsonObject();
+    if (page != null) {
+      params.add("page", page.toProtocolRef());
+    }
+    JsonObject recordHarArgs = new JsonObject();
+    recordHarArgs.addProperty("zip", har.toString().endsWith(".zip"));
+    recordHarArgs.addProperty("content", contentPolicy.name().toLowerCase());
+    recordHarArgs.addProperty("mode", mode.name().toLowerCase());
+    addHarUrlFilter(recordHarArgs, urlFilter);
+    if (resourcesDir != null) {
+      recordHarArgs.addProperty("resourcesDir", resourcesDir.toString());
+    }
+    if (!har.toString().endsWith(".zip")) {
+      recordHarArgs.addProperty("harPath", har.toString());
+    }
+
+    params.add("options", recordHarArgs);
+    JsonObject json = sendMessage("harStart", params, NO_TIMEOUT).getAsJsonObject();
+    String harId = json.get("harId").getAsString();
+    harRecorders.put(harId, new HarRecorder(har, contentPolicy));
+    return harId;
+  }
+
+  void exportHar(String harId) {
+    HarRecorder harParams = harRecorders.remove(harId);
+    if (harParams == null) {
+      return;
+    }
+    boolean isLocal = !connection.isRemote;
+    boolean isZip = harParams.path.toString().endsWith(".zip");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("harId", harId);
+    if (isLocal) {
+      params.addProperty("mode", "entries");
+      JsonObject json = sendMessage("harExport", params, NO_TIMEOUT).getAsJsonObject();
+      if (!isZip) {
+        return;
+      }
+      JsonArray entries = json.getAsJsonArray("entries");
+      connection.localUtils.zip(harParams.path, entries, null, false, false, java.util.Collections.emptyList());
+      return;
+    }
+
+    params.addProperty("mode", "archive");
+    JsonObject json = sendMessage("harExport", params, NO_TIMEOUT).getAsJsonObject();
+    ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
+    if (isZip) {
+      artifact.saveAs(harParams.path);
+      artifact.delete();
+      return;
+    }
+    String tmpPath = harParams.path + ".tmp";
+    artifact.saveAs(Paths.get(tmpPath));
+    JsonObject unzipParams = new JsonObject();
+    unzipParams.addProperty("zipFile", tmpPath);
+    unzipParams.addProperty("harFile", harParams.path.toString());
+    connection.localUtils.sendMessage("harUnzip", unzipParams, NO_TIMEOUT);
+    artifact.delete();
+  }
+
+  void exportAllHars() {
+    for (String harId : new ArrayList<>(harRecorders.keySet())) {
+      exportHar(harId);
+    }
+  }
+
   void setTracesDir(Path tracesDir) {
     this.tracesDir = tracesDir;
   }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java
index 15e56d0b1..a4bb66d65 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/VideoImpl.java
@@ -22,31 +22,23 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static java.util.Arrays.asList;
-
 class VideoImpl implements Video {
   private final PageImpl page;
-  private final WaitableResult<ArtifactImpl> waitableArtifact = new WaitableResult<>();
+  ArtifactImpl artifact;
 
   VideoImpl(PageImpl page) {
     this.page = page;
   }
 
-  void setArtifact(ArtifactImpl artifact) {
-    waitableArtifact.complete(artifact);
-  }
-
-  private ArtifactImpl waitForArtifact() {
-    Waitable<ArtifactImpl> waitable = new WaitableRace<>(asList(waitableArtifact, (Waitable<ArtifactImpl>) page.waitableClosedOrCrashed));
-    return page.runUntil(() -> {}, waitable);
+  VideoImpl(PageImpl page, ArtifactImpl artifact) {
+    this.page = page;
+    this.artifact = artifact;
   }
 
   @Override
   public void delete() {
-    try {
-      waitForArtifact().delete();
-    } catch (PlaywrightException e) {
-    }
+    if (artifact != null)
+      artifact.delete();
   }
 
   @Override
@@ -54,22 +46,15 @@ public Path path() {
     if (page.connection.isRemote) {
       throw new PlaywrightException("Path is not available when using browserType.connect(). Use saveAs() to save a local copy.");
     }
-    try {
-      return Paths.get(waitForArtifact().initializer.get("absolutePath").getAsString());
-    } catch (PlaywrightException e) {
-      throw new PlaywrightException("Page did not produce any video frames", e);
-    }
+    if (artifact == null)
+      throw new PlaywrightException("Video recording has not been started.");
+    return Paths.get(artifact.initializer.get("absolutePath").getAsString());
   }
 
   @Override
   public void saveAs(Path path) {
-    if (!page.isClosed()) {
-      throw new PlaywrightException("Page is not yet closed. Close the page prior to calling saveAs");
-    }
-    try {
-      waitForArtifact().saveAs(path);
-    } catch (PlaywrightException e) {
-      throw new PlaywrightException("Page did not produce any video frames", e);
-    }
+    if (artifact == null)
+      throw new PlaywrightException("Video recording has not been started.");
+    artifact.saveAs(path);
   }
 }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java b/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java
index 26216d5fa..125af1a51 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/WaitForEventLogger.java
@@ -41,7 +41,8 @@ public T get() {
     {
       JsonObject info = new JsonObject();
       info.addProperty("phase", "before");
-      sendWaitForEventInfo(info);
+      info.addProperty("event", "");
+      sendWaitInfo(info);
     }
     JsonObject info = new JsonObject();
     info.addProperty("phase", "after");
@@ -51,7 +52,7 @@ public T get() {
       info.addProperty("error", e.getMessage());
       throw e;
     } finally {
-      sendWaitForEventInfo(info);
+      sendWaitInfo(info);
     }
   }
 
@@ -61,14 +62,15 @@ public void log(String message) {
     JsonObject info = new JsonObject();
     info.addProperty("phase", "log");
     info.addProperty("message", message);
-    sendWaitForEventInfo(info);
+    sendWaitInfo(info);
   }
 
-  private void sendWaitForEventInfo(JsonObject info) {
-    info.addProperty("event", "");
+  private void sendWaitInfo(JsonObject info) {
     info.addProperty("waitId", waitId);
-    JsonObject params = new JsonObject();
-    params.add("info", info);
-    channel.sendMessageAsync("waitForEventInfo", params);
+    try {
+      channel.sendMessageNoReply("__waitInfo__", info);
+    } catch (RuntimeException e) {
+      // Fire-and-forget: never throw to the caller.
+    }
   }
 }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WaitableResult.java b/playwright/src/main/java/com/microsoft/playwright/impl/WaitableResult.java
index 831874dbf..76cf50034 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/WaitableResult.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/WaitableResult.java
@@ -52,6 +52,8 @@ public T get() {
         throw new TimeoutError(exception.getMessage(), exception);
       } if (exception instanceof TargetClosedError) {
         throw new TargetClosedError(exception.getMessage(), exception);
+      } if (exception instanceof ServerErrorWithDetails) {
+        throw new ServerErrorWithDetails((ServerErrorWithDetails) exception);
       }
       throw new PlaywrightException(exception.getMessage(), exception);
     }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WebErrorImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/WebErrorImpl.java
index d4e0a8e77..95530ac05 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/WebErrorImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/WebErrorImpl.java
@@ -17,14 +17,17 @@
 package com.microsoft.playwright.impl;
 
 import com.microsoft.playwright.WebError;
+import com.microsoft.playwright.options.WebErrorLocation;
 
 public class WebErrorImpl implements WebError {
   private final PageImpl page;
   private final String error;
+  private final WebErrorLocation location;
 
-  WebErrorImpl(PageImpl page, String error) {
+  WebErrorImpl(PageImpl page, String error, WebErrorLocation location) {
     this.page = page;
     this.error = error;
+    this.location = location;
   }
 
   @Override
@@ -36,4 +39,9 @@ public PageImpl page() {
   public String error() {
     return error;
   }
+
+  @Override
+  public WebErrorLocation location() {
+    return location;
+  }
 }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WebSocketRouteImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/WebSocketRouteImpl.java
index ab9ed40a0..e8664c9d1 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/WebSocketRouteImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/WebSocketRouteImpl.java
@@ -1,11 +1,14 @@
 package com.microsoft.playwright.impl;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.WebSocketFrame;
 import com.microsoft.playwright.WebSocketRoute;
 
+import java.util.ArrayList;
 import java.util.Base64;
+import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -65,6 +68,11 @@ public void send(byte[] message) {
     public String url() {
       return initializer.get("url").getAsString();
     }
+
+    @Override
+    public List<String> protocols() {
+      return readProtocols();
+    }
   };
 
   WebSocketRouteImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
@@ -123,6 +131,22 @@ public String url() {
     return initializer.get("url").getAsString();
   }
 
+  @Override
+  public List<String> protocols() {
+    return readProtocols();
+  }
+
+  private List<String> readProtocols() {
+    List<String> result = new ArrayList<>();
+    if (!initializer.has("protocols")) {
+      return result;
+    }
+    for (JsonElement element : initializer.getAsJsonArray("protocols")) {
+      result.add(element.getAsString());
+    }
+    return result;
+  }
+
   void afterHandle() {
     if (this.connected) {
       return;
@@ -160,9 +184,9 @@ protected void handleEvent(String event, JsonObject params) {
         sendMessageAsync("sendToPage", messageParams);
       }
     } else if ("closePage".equals(event)) {
-      int code = params.get("code").getAsInt();
-      String reason = params.get("reason").getAsString();
-      boolean wasClean = params.get("wasClean").getAsBoolean();
+      Integer code = params.has("code") ? params.get("code").getAsInt() : null;
+      String reason = params.has("reason") ? params.get("reason").getAsString() : null;
+      boolean wasClean = params.has("wasClean") && params.get("wasClean").getAsBoolean();
       if (onPageClose != null) {
         onPageClose.accept(code, reason);
       } else {
@@ -173,9 +197,9 @@ protected void handleEvent(String event, JsonObject params) {
         sendMessageAsync("closeServer", closeParams);
       }
     } else if ("closeServer".equals(event)) {
-      int code = params.get("code").getAsInt();
-      String reason = params.get("reason").getAsString();
-      boolean wasClean = params.get("wasClean").getAsBoolean();
+      Integer code = params.has("code") ? params.get("code").getAsInt() : null;
+      String reason = params.has("reason") ? params.get("reason").getAsString() : null;
+      boolean wasClean = params.has("wasClean") && params.get("wasClean").getAsBoolean();
       if (onServerClose != null) {
         onServerClose.accept(code, reason);
       } else {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WebStorageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/WebStorageImpl.java
new file mode 100644
index 000000000..96d507d6e
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/WebStorageImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.WebStorage;
+import com.microsoft.playwright.options.WebStorageItem;
+
+import java.util.List;
+
+import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
+import static com.microsoft.playwright.impl.Serialization.gson;
+import static java.util.Arrays.asList;
+
+class WebStorageImpl implements WebStorage {
+  private final PageImpl page;
+  private final String kind;
+
+  WebStorageImpl(PageImpl page, String kind) {
+    this.page = page;
+    this.kind = kind;
+  }
+
+  private JsonObject createParams() {
+    JsonObject params = new JsonObject();
+    params.addProperty("kind", kind);
+    return params;
+  }
+
+  @Override
+  public List<WebStorageItem> items() {
+    JsonObject json = page.sendMessage("webStorageItems", createParams(), NO_TIMEOUT).getAsJsonObject();
+    return asList(gson().fromJson(json.getAsJsonArray("items"), WebStorageItem[].class));
+  }
+
+  @Override
+  public String getItem(String name) {
+    JsonObject params = createParams();
+    params.addProperty("name", name);
+    JsonObject json = page.sendMessage("webStorageGetItem", params, NO_TIMEOUT).getAsJsonObject();
+    return json.has("value") ? json.get("value").getAsString() : null;
+  }
+
+  @Override
+  public void setItem(String name, String value) {
+    JsonObject params = createParams();
+    params.addProperty("name", name);
+    params.addProperty("value", value);
+    page.sendMessage("webStorageSetItem", params, NO_TIMEOUT);
+  }
+
+  @Override
+  public void removeItem(String name) {
+    JsonObject params = createParams();
+    params.addProperty("name", name);
+    page.sendMessage("webStorageRemoveItem", params, NO_TIMEOUT);
+  }
+
+  @Override
+  public void clear() {
+    page.sendMessage("webStorageClear", createParams(), NO_TIMEOUT);
+  }
+}
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java
index df81e7338..1d91f018c 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java
@@ -18,21 +18,25 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
+import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Worker;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 
 import static com.microsoft.playwright.impl.Serialization.*;
 
 class WorkerImpl extends ChannelOwner implements Worker {
-  private final ListenerCollection<EventType> listeners = new ListenerCollection<>();
+  final ListenerCollection<EventType> listeners = new ListenerCollection<>();
   PageImpl page;
 
   enum EventType {
     CLOSE,
+    CONSOLE,
   }
 
   WorkerImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
@@ -49,9 +53,19 @@ public void offClose(Consumer<Worker> handler) {
     listeners.remove(EventType.CLOSE, handler);
   }
 
-  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Double timeout) {
+  @Override
+  public void onConsole(Consumer<ConsoleMessage> handler) {
+    listeners.add(EventType.CONSOLE, handler);
+  }
+
+  @Override
+  public void offConsole(Consumer<ConsoleMessage> handler) {
+    listeners.remove(EventType.CONSOLE, handler);
+  }
+
+  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
     List<Waitable<T>> waitables = new ArrayList<>();
-    waitables.add(new WaitableEvent<>(listeners, eventType));
+    waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
     waitables.add(page.createWaitForCloseHelper());
     waitables.add(page.createWaitableTimeout(timeout));
     return runUntil(code, new WaitableRace<>(waitables));
@@ -62,11 +76,23 @@ public Worker waitForClose(WaitForCloseOptions options, Runnable code) {
     return withWaitLogging("Worker.waitForClose", logger -> waitForCloseImpl(options, code));
   }
 
+  @Override
+  public ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable code) {
+    return withWaitLogging("Worker.waitForConsoleMessage", logger -> waitForConsoleMessageImpl(options, code));
+  }
+
+  private ConsoleMessage waitForConsoleMessageImpl(WaitForConsoleMessageOptions options, Runnable code) {
+    if (options == null) {
+      options = new WaitForConsoleMessageOptions();
+    }
+    return waitForEventWithTimeout(EventType.CONSOLE, code, options.predicate, options.timeout);
+  }
+
   private Worker waitForCloseImpl(WaitForCloseOptions options, Runnable code) {
     if (options == null) {
       options = new WaitForCloseOptions();
     }
-    return waitForEventWithTimeout(EventType.CLOSE, code, options.timeout);
+    return waitForEventWithTimeout(EventType.CLOSE, code, null, options.timeout);
   }
 
   @Override
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/PlaywrightExtension.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/PlaywrightExtension.java
index f25ecc18d..d1873bb61 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/junit/PlaywrightExtension.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/junit/PlaywrightExtension.java
@@ -36,7 +36,7 @@ public class PlaywrightExtension implements ParameterResolver {
   // There should be at most one instance of PlaywrightRegistry per test run, it keeps
   // track of all created Playwright instances and calls `close()` on each of them after
   // the tests finished.
-  static class PlaywrightRegistry implements ExtensionContext.Store.CloseableResource {
+  static class PlaywrightRegistry implements AutoCloseable {
     private final List<Playwright> playwrightList = Collections.synchronizedList(new ArrayList<>());
 
     static synchronized PlaywrightRegistry getOrCreateFor(ExtensionContext extensionContext) {
@@ -59,7 +59,7 @@ Playwright createPlaywright(Playwright.CreateOptions options) {
     // This is a workaround for JUnit's lack of an "AfterTestRun" hook
     // This will be called once after all tests have completed.
     @Override
-    public void close() throws Throwable {
+    public void close() {
       for (Playwright playwright : playwrightList) {
         playwright.close();
       }
diff --git a/playwright/src/main/java/com/microsoft/playwright/junit/OptionsFactory.java b/playwright/src/main/java/com/microsoft/playwright/junit/OptionsFactory.java
index 52a7907e0..3a6256a1a 100644
--- a/playwright/src/main/java/com/microsoft/playwright/junit/OptionsFactory.java
+++ b/playwright/src/main/java/com/microsoft/playwright/junit/OptionsFactory.java
@@ -36,7 +36,7 @@
  *     public Options getOptions() {
  *       return new Options()
  *           .setHeadless(false)
- *           .setContextOption(new Browser.NewContextOptions()
+ *           .setContextOptions(new Browser.NewContextOptions()
  *               .setBaseURL("https://github.com"))
  *           .setApiRequestOptions(new APIRequest.NewContextOptions()
  *               .setBaseURL("https://playwright.dev"));
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/Annotate.java b/playwright/src/main/java/com/microsoft/playwright/options/Annotate.java
new file mode 100644
index 000000000..edb1612cc
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/Annotate.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public class Annotate {
+  /**
+   * How long each annotation is displayed in milliseconds. Defaults to {@code 500}.
+   */
+  public Double duration;
+  /**
+   * Position of the action title overlay. Defaults to {@code "top-right"}.
+   */
+  public AnnotatePosition position;
+  /**
+   * Font size of the action title in pixels. Defaults to {@code 24}.
+   */
+  public Integer fontSize;
+
+  /**
+   * How long each annotation is displayed in milliseconds. Defaults to {@code 500}.
+   */
+  public Annotate setDuration(double duration) {
+    this.duration = duration;
+    return this;
+  }
+  /**
+   * Position of the action title overlay. Defaults to {@code "top-right"}.
+   */
+  public Annotate setPosition(AnnotatePosition position) {
+    this.position = position;
+    return this;
+  }
+  /**
+   * Font size of the action title in pixels. Defaults to {@code 24}.
+   */
+  public Annotate setFontSize(int fontSize) {
+    this.fontSize = fontSize;
+    return this;
+  }
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/AnnotatePosition.java b/playwright/src/main/java/com/microsoft/playwright/options/AnnotatePosition.java
new file mode 100644
index 000000000..40ed3a516
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/AnnotatePosition.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum AnnotatePosition {
+  TOP_LEFT,
+  TOP,
+  TOP_RIGHT,
+  BOTTOM_LEFT,
+  BOTTOM,
+  BOTTOM_RIGHT
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/AriaSnapshotMode.java b/playwright/src/main/java/com/microsoft/playwright/options/AriaSnapshotMode.java
new file mode 100644
index 000000000..1bbed9d93
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/AriaSnapshotMode.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum AriaSnapshotMode {
+  AI,
+  DEFAULT
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/BindResult.java b/playwright/src/main/java/com/microsoft/playwright/options/BindResult.java
new file mode 100644
index 000000000..11e128212
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/BindResult.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public class BindResult {
+  public String endpoint;
+
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/ConsoleMessagesFilter.java b/playwright/src/main/java/com/microsoft/playwright/options/ConsoleMessagesFilter.java
new file mode 100644
index 000000000..7ff2a9e86
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/ConsoleMessagesFilter.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum ConsoleMessagesFilter {
+  ALL,
+  SINCE_NAVIGATION
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/Cookie.java b/playwright/src/main/java/com/microsoft/playwright/options/Cookie.java
index ee7888536..9c3fc3407 100644
--- a/playwright/src/main/java/com/microsoft/playwright/options/Cookie.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/Cookie.java
@@ -20,16 +20,16 @@ public class Cookie {
   public String name;
   public String value;
   /**
-   * Either url or domain / path are required. Optional.
+   * Either {@code url} or both {@code domain} and {@code path} are required. Optional.
    */
   public String url;
   /**
-   * For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com". Either url or
-   * domain / path are required. Optional.
+   * For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com". Either {@code
+   * url} or both {@code domain} and {@code path} are required. Optional.
    */
   public String domain;
   /**
-   * Either url or domain / path are required Optional.
+   * Either {@code url} or both {@code domain} and {@code path} are required. Optional.
    */
   public String path;
   /**
@@ -60,22 +60,22 @@ public Cookie(String name, String value) {
     this.value = value;
   }
   /**
-   * Either url or domain / path are required. Optional.
+   * Either {@code url} or both {@code domain} and {@code path} are required. Optional.
    */
   public Cookie setUrl(String url) {
     this.url = url;
     return this;
   }
   /**
-   * For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com". Either url or
-   * domain / path are required. Optional.
+   * For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com". Either {@code
+   * url} or both {@code domain} and {@code path} are required. Optional.
    */
   public Cookie setDomain(String domain) {
     this.domain = domain;
     return this;
   }
   /**
-   * Either url or domain / path are required Optional.
+   * Either {@code url} or both {@code domain} and {@code path} are required. Optional.
    */
   public Cookie setPath(String path) {
     this.path = path;
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/DebuggerPausedDetails.java b/playwright/src/main/java/com/microsoft/playwright/options/DebuggerPausedDetails.java
new file mode 100644
index 000000000..95a3ff595
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/DebuggerPausedDetails.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public class DebuggerPausedDetails {
+  public Location location;
+  public String title;
+
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/DropPayload.java b/playwright/src/main/java/com/microsoft/playwright/options/DropPayload.java
new file mode 100644
index 000000000..7571471df
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/DropPayload.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+import java.util.Map;
+
+public class DropPayload {
+  public Object files;
+  public Map<String, String> data;
+
+  public DropPayload setFiles(Object files) {
+    this.files = files;
+    return this;
+  }
+  public DropPayload setData(Map<String, String> data) {
+    this.data = data;
+    return this;
+  }
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/PseudoElement.java b/playwright/src/main/java/com/microsoft/playwright/options/PseudoElement.java
new file mode 100644
index 000000000..a9bfe5d4a
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/PseudoElement.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum PseudoElement {
+  BEFORE,
+  AFTER
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/ScreencastCursor.java b/playwright/src/main/java/com/microsoft/playwright/options/ScreencastCursor.java
new file mode 100644
index 000000000..0e09c1ef0
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/ScreencastCursor.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum ScreencastCursor {
+  NONE,
+  POINTER
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java b/playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java
index 6c21e8d8b..6914e5dee 100644
--- a/playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java
@@ -18,5 +18,6 @@
 
 public enum ScreenshotType {
   PNG,
-  JPEG
+  JPEG,
+  WEBP
 }
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/ScrollMode.java b/playwright/src/main/java/com/microsoft/playwright/options/ScrollMode.java
new file mode 100644
index 000000000..170ed0e12
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/ScrollMode.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum ScrollMode {
+  AUTO,
+  NONE
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/Size.java b/playwright/src/main/java/com/microsoft/playwright/options/Size.java
new file mode 100644
index 000000000..fb9ac7d8a
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/Size.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public class Size {
+  /**
+   * Max frame width in pixels.
+   */
+  public int width;
+  /**
+   * Max frame height in pixels.
+   */
+  public int height;
+
+  public Size(int width, int height) {
+    this.width = width;
+    this.height = height;
+  }
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/Timing.java b/playwright/src/main/java/com/microsoft/playwright/options/Timing.java
index 0415468d1..906539a64 100644
--- a/playwright/src/main/java/com/microsoft/playwright/options/Timing.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/Timing.java
@@ -22,42 +22,42 @@ public class Timing {
    */
   public double startTime;
   /**
-   * Time immediately before the browser starts the domain name lookup for the resource. The value is given in milliseconds
+   * Time immediately before the client starts the domain name lookup for the resource. The value is given in milliseconds
    * relative to {@code startTime}, -1 if not available.
    */
   public double domainLookupStart;
   /**
-   * Time immediately after the browser starts the domain name lookup for the resource. The value is given in milliseconds
+   * Time immediately after the client ends the domain name lookup for the resource. The value is given in milliseconds
    * relative to {@code startTime}, -1 if not available.
    */
   public double domainLookupEnd;
   /**
-   * Time immediately before the user agent starts establishing the connection to the server to retrieve the resource. The
-   * value is given in milliseconds relative to {@code startTime}, -1 if not available.
+   * Time immediately before the client starts establishing the connection to the server to retrieve the resource. The value
+   * is given in milliseconds relative to {@code startTime}, -1 if not available.
    */
   public double connectStart;
   /**
-   * Time immediately before the browser starts the handshake process to secure the current connection. The value is given in
+   * Time immediately before the client starts the handshake process to secure the current connection. The value is given in
    * milliseconds relative to {@code startTime}, -1 if not available.
    */
   public double secureConnectionStart;
   /**
-   * Time immediately before the user agent starts establishing the connection to the server to retrieve the resource. The
-   * value is given in milliseconds relative to {@code startTime}, -1 if not available.
+   * Time immediately after the client establishes the connection to the server to retrieve the resource. The value is given
+   * in milliseconds relative to {@code startTime}, -1 if not available.
    */
   public double connectEnd;
   /**
-   * Time immediately before the browser starts requesting the resource from the server, cache, or local resource. The value
+   * Time immediately before the client starts requesting the resource from the server, cache, or local resource. The value
    * is given in milliseconds relative to {@code startTime}, -1 if not available.
    */
   public double requestStart;
   /**
-   * Time immediately after the browser receives the first byte of the response from the server, cache, or local resource.
-   * The value is given in milliseconds relative to {@code startTime}, -1 if not available.
+   * Time immediately after the client receives the first byte of the response from the server, cache, or local resource. The
+   * value is given in milliseconds relative to {@code startTime}, -1 if not available.
    */
   public double responseStart;
   /**
-   * Time immediately after the browser receives the last byte of the resource or immediately before the transport connection
+   * Time immediately after the client receives the last byte of the resource or immediately before the transport connection
    * is closed, whichever comes first. The value is given in milliseconds relative to {@code startTime}, -1 if not available.
    */
   public double responseEnd;
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/VirtualCredential.java b/playwright/src/main/java/com/microsoft/playwright/options/VirtualCredential.java
new file mode 100644
index 000000000..06a7f74ca
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/VirtualCredential.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public class VirtualCredential {
+  /**
+   * Base64url-encoded credential id.
+   */
+  public String id;
+  /**
+   * Relying party id.
+   */
+  public String rpId;
+  /**
+   * Base64url-encoded user handle.
+   */
+  public String userHandle;
+  /**
+   * Base64url-encoded PKCS#8 (DER) private key.
+   */
+  public String privateKey;
+  /**
+   * Base64url-encoded SPKI (DER) public key.
+   */
+  public String publicKey;
+
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/WebErrorLocation.java b/playwright/src/main/java/com/microsoft/playwright/options/WebErrorLocation.java
new file mode 100644
index 000000000..68ed5146b
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/WebErrorLocation.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public class WebErrorLocation {
+  /**
+   * URL of the resource.
+   */
+  public String url;
+  /**
+   * 0-based line number in the resource.
+   */
+  public int line;
+  /**
+   * 0-based column number in the resource.
+   */
+  public int column;
+
+}
\ No newline at end of file
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/WebStorageItem.java b/playwright/src/main/java/com/microsoft/playwright/options/WebStorageItem.java
new file mode 100644
index 000000000..0b95002fc
--- /dev/null
+++ b/playwright/src/main/java/com/microsoft/playwright/options/WebStorageItem.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public class WebStorageItem {
+  public String name;
+  public String value;
+
+}
\ No newline at end of file
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java
index 40c065404..4d3ef7203 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java
@@ -20,6 +20,7 @@
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.junit.FixtureTest;
 import com.microsoft.playwright.junit.UsePlaywright;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
 
@@ -30,6 +31,7 @@
 
 @FixtureTest
 @UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
+@Tag("smoke")
 public class TestBrowser1 {
 
   @Test
@@ -113,4 +115,13 @@ void shouldPropagateCloseReasonToPendingActions(Browser browser) {
     assertTrue(e.getMessage().contains("The reason."), e.getMessage());
   }
 
+  @Test
+  void shouldFireContextEvent(Browser browser) {
+    BrowserContext[] contextEvent = { null };
+    browser.onContext(c -> contextEvent[0] = c);
+    BrowserContext context = browser.newContext();
+    assertEquals(context, contextEvent[0]);
+    context.close();
+  }
+
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserBind.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserBind.java
new file mode 100644
index 000000000..b849293ed
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserBind.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.BindResult;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestBrowserBind extends TestBase {
+  @Test
+  void shouldBindAndUnbindBrowser() {
+    BindResult serverInfo = browser.bind("default");
+    try {
+      assertNotNull(serverInfo);
+      assertNotNull(serverInfo.endpoint);
+      assertFalse(serverInfo.endpoint.isEmpty());
+    } finally {
+      browser.unbind();
+    }
+  }
+
+  @Test
+  void shouldBindWithCustomTitleAndOptions() {
+    BindResult serverInfo = browser.bind("my-title",
+      new Browser.BindOptions().setHost("127.0.0.1").setPort(0));
+    try {
+      assertNotNull(serverInfo);
+      assertNotNull(serverInfo.endpoint);
+      assertFalse(serverInfo.endpoint.isEmpty());
+    } finally {
+      browser.unbind();
+    }
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
index 29aa3de77..f78dd8703 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
@@ -18,6 +18,7 @@
 
 import com.microsoft.playwright.junit.FixtureTest;
 import com.microsoft.playwright.junit.UsePlaywright;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
@@ -32,6 +33,7 @@
 
 @FixtureTest
 @UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
+@Tag("smoke")
 public class TestBrowserContextBasic {
   @Test
   void shouldCreateNewContext(Browser browser) {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java
index 3dfafc18a..bf0ef7d5a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java
@@ -131,8 +131,9 @@ void shouldDetachWhenPageCloses() {
     CDPSession session = page.context().newCDPSession(page);
     page.close();
 
-    PlaywrightException exception = assertThrows(PlaywrightException.class, session::detach);
-    assertTrue(exception.getMessage().contains("Target page, context or browser has been closed"), exception.getMessage());
+    // Like the upstream test, only check that detach fails — the error depends on
+    // whether the session detached before or after the page closed.
+    assertThrows(PlaywrightException.class, session::detach);
     context.close();
   }
 
@@ -155,6 +156,26 @@ void shouldAddMultipleEventListeners() {
     assertEquals(2, events.size());
   }
 
+  @Test
+  void shouldEmitEventForEachCDPEvent() {
+    CDPSession client = page.context().newCDPSession(page);
+    client.send("Network.enable");
+    List<JsonObject> events = new ArrayList<>();
+    client.on("event", events::add);
+    page.navigate(server.EMPTY_PAGE);
+    assertTrue(events.size() > 0);
+    JsonObject requestEvent = null;
+    for (JsonObject e : events) {
+      if ("Network.requestWillBeSent".equals(e.get("method").getAsString())) {
+        requestEvent = e;
+        break;
+      }
+    }
+    assertNotNull(requestEvent);
+    assertEquals(server.EMPTY_PAGE,
+      requestEvent.getAsJsonObject("params").getAsJsonObject("request").get("url").getAsString());
+  }
+
   @Test
   void shouldRemoveEventListeners() {
     CDPSession cdpSession = page.context().newCDPSession(page);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java
index a1c95b87f..d228f8f3e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java
@@ -186,4 +186,90 @@ void pageErrorEventShouldWork() {
     assertTrue(webError[0].error().contains("boom"), webError[0].error());
   }
 
+  @Test
+  void weberrorEventShouldIncludeLocation() {
+    server.setRoute("/error.js", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "application/javascript");
+      exchange.sendResponseHeaders(200, 0);
+      try (Writer writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("\nfunction foo() {\n  throw new Error('boom');\n}\nfoo();\n");
+      }
+    });
+    server.setRoute("/error.html", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "text/html");
+      exchange.sendResponseHeaders(200, 0);
+      try (Writer writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("<script src=\"/error.js\"></script>");
+      }
+    });
+    WebError[] webError = { null };
+    context.onWebError(e -> webError[0] = e);
+    page.navigate(server.PREFIX + "/error.html");
+    waitForCondition(() -> webError[0] != null);
+    com.microsoft.playwright.options.WebErrorLocation location = webError[0].location();
+    assertEquals(server.PREFIX + "/error.js", location.url);
+    assertEquals(2, location.line);
+    assertTrue(location.column > 0, "expected column > 0, got " + location.column);
+  }
+
+  @Test
+  void pageLoadEventShouldWork() {
+    Page[] loaded = { null };
+    context.onPageLoad(p -> loaded[0] = p);
+    page.navigate(server.EMPTY_PAGE);
+    waitForCondition(() -> loaded[0] != null);
+    assertEquals(page, loaded[0]);
+  }
+
+  @Test
+  void frameNavigatedEventShouldWork() {
+    Frame[] navigated = { null };
+    context.onFrameNavigated(f -> navigated[0] = f);
+    page.navigate(server.EMPTY_PAGE);
+    waitForCondition(() -> navigated[0] != null);
+    assertEquals(page.mainFrame(), navigated[0]);
+    assertEquals(server.EMPTY_PAGE, navigated[0].url());
+  }
+
+  @Test
+  void pageCloseEventShouldWork() {
+    Page newPage = context.newPage();
+    Page[] closed = { null };
+    context.onPageClose(p -> closed[0] = p);
+    newPage.close();
+    waitForCondition(() -> closed[0] != null);
+    assertEquals(newPage, closed[0]);
+  }
+
+  @Test
+  void frameAttachedEventShouldWork() {
+    page.navigate(server.EMPTY_PAGE);
+    Frame[] attached = { null };
+    context.onFrameAttached(f -> attached[0] = f);
+    page.evaluate("() => {\n" +
+      "  const iframe = document.createElement('iframe');\n" +
+      "  iframe.src = 'about:blank';\n" +
+      "  document.body.appendChild(iframe);\n" +
+      "}");
+    waitForCondition(() -> attached[0] != null);
+    assertEquals(page.mainFrame(), attached[0].parentFrame());
+  }
+
+  @Test
+  void frameDetachedEventShouldWork() {
+    page.navigate(server.EMPTY_PAGE);
+    page.evaluate("() => {\n" +
+      "  const iframe = document.createElement('iframe');\n" +
+      "  iframe.id = 'x';\n" +
+      "  iframe.src = 'about:blank';\n" +
+      "  document.body.appendChild(iframe);\n" +
+      "}");
+    page.waitForSelector("iframe");
+    Frame[] detached = { null };
+    context.onFrameDetached(f -> detached[0] = f);
+    page.evaluate("() => document.getElementById('x').remove()");
+    waitForCondition(() -> detached[0] != null);
+    assertEquals(page.mainFrame(), detached[0].parentFrame());
+  }
+
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
index 3d522bc0c..b8a7f7f76 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
@@ -84,19 +84,4 @@ void shouldBeCallableFromInsideAddInitScript() {
     assertEquals(asList("context", "page"), actualArgs);
   }
 
-  @Test
-  void exposeBindingHandleShouldWork() {
-    JSHandle[] target = { null };
-    context.exposeBinding("logme", (source, args) -> {
-      target[0] = (JSHandle) args[0];
-      return 17;
-    }, new BrowserContext.ExposeBindingOptions().setHandle(true));
-    Page page = context.newPage();
-    Object result = page.evaluate("async function() {\n" +
-      "  return window['logme']({ foo: 42 });\n" +
-      "}");
-    assertNotNull(target[0]);
-    assertEquals(42, target[0].evaluate("x => x.foo"));
-    assertEquals(17, result);
-  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
index d7352c748..0713f4b10 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
@@ -28,6 +28,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.text.ParseException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
@@ -55,6 +56,22 @@ void getShouldWork() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
+  @Test
+  void getShouldReturnTiming() {
+    APIResponse response = context.request().get(server.PREFIX + "/simple.json");
+    assertTrue(response.ok());
+    Timing timing = response.timing();
+    assertTrue(timing.startTime > 0, "startTime = " + timing.startTime);
+    assertTrue(timing.domainLookupEnd >= timing.domainLookupStart);
+    assertTrue(timing.connectStart >= timing.domainLookupEnd);
+    assertEquals(-1, timing.secureConnectionStart);
+    assertTrue(timing.connectEnd >= timing.connectStart);
+    assertTrue(timing.requestStart >= timing.connectEnd);
+    assertTrue(timing.responseStart >= timing.requestStart);
+    assertTrue(timing.responseEnd >= timing.responseStart);
+    assertTrue(timing.responseEnd < 60_000, "responseEnd = " + timing.responseEnd);
+  }
+
   @Test
   void fetchShouldWork() {
     APIResponse response = context.request().fetch(server.PREFIX + "/simple.json");
@@ -533,6 +550,23 @@ void shouldSupportOffsetDateTimeInData() throws ExecutionException, InterruptedE
     assertEquals("{\"date\":\"2024-07-10T18:15:30.000Z\"}", new String(body));
   }
 
+  public static class LocalDateData {
+    public String name;
+    public LocalDate date;
+  }
+
+  @Test
+  void shouldSupportLocalDateInData() throws ExecutionException, InterruptedException {
+    APIRequestContext request = playwright.request().newContext();
+    LocalDateData testData = new LocalDateData();
+    testData.name = "foo";
+    testData.date = LocalDate.of(2022, 12, 23);
+    Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+    request.post(server.EMPTY_PAGE, RequestOptions.create().setData(testData));
+    byte[] body = serverRequest.get().postBody;
+    assertEquals("{\"name\":\"foo\",\"date\":\"2022-12-23\"}", new String(body));
+  }
+
   @Test
   void shouldSupportApplicationXWwwFormUrlencoded() throws ExecutionException, InterruptedException {
     Future<Server.Request> req = server.futureRequest("/empty.html");
@@ -741,10 +775,12 @@ void shouldAbortRequestsWhenBrowserContextCloses() {
     });
     page.evaluate("() => setTimeout(closeContext, 1000);");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.EMPTY_PAGE));
-    assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
+    assertTrue(e.getMessage().contains("Request context disposed") ||
+      e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
 
     e = assertThrows(PlaywrightException.class, () ->  context.request().post(server.EMPTY_PAGE));
-    assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
+    assertTrue(e.getMessage().contains("Request context disposed") ||
+      e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
   @Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
index 9cc58d13c..02b072c19 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
@@ -19,6 +19,7 @@
 import com.microsoft.playwright.options.HarMode;
 import com.microsoft.playwright.options.HarNotFound;
 import com.microsoft.playwright.options.RouteFromHarUpdateContentPolicy;
+import com.microsoft.playwright.options.Timing;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.io.TempDir;
@@ -501,4 +502,36 @@ void shouldIgnoreAbortedRequests(@TempDir Path tmpDir) {
       assertNull(page.evaluate("window.result"));
     }
   }
+
+  private void setJsonRoute(String path, String json) {
+    server.setRoute(path, exchange -> {
+      exchange.getResponseHeaders().add("Content-Type", "application/json");
+      byte[] body = json.getBytes(StandardCharsets.UTF_8);
+      exchange.sendResponseHeaders(200, body.length);
+      try (OutputStream out = exchange.getResponseBody()) {
+        out.write(body);
+      }
+    });
+  }
+
+  @Test
+  void shouldNotInterceptAPIRequestContextRequestsByDefault(@TempDir Path tmpDir) {
+    setJsonRoute("/api/data", "{\"hello\": \"live\"}");
+    Path harPath = tmpDir.resolve("api.har");
+    try (BrowserContext context1 = browser.newContext()) {
+      context1.routeFromHAR(harPath, new BrowserContext.RouteFromHAROptions().setUpdate(true));
+      Page page1 = context1.newPage();
+      page1.navigate(server.EMPTY_PAGE);
+      page1.request().get(server.PREFIX + "/api/data");
+    }
+
+    // Without the option, the live network is hit.
+    setJsonRoute("/api/data", "{\"hello\": \"fresh\"}");
+    try (BrowserContext context2 = browser.newContext()) {
+      context2.routeFromHAR(harPath, new BrowserContext.RouteFromHAROptions().setNotFound(HarNotFound.FALLBACK));
+      Page page2 = context2.newPage();
+      APIResponse replayed = page2.request().get(server.PREFIX + "/api/data");
+      assertEquals("{\"hello\": \"fresh\"}", replayed.text());
+    }
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
index a398aaba0..1f7239252 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
@@ -31,6 +31,7 @@
 import static com.microsoft.playwright.Utils.mapOf;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestBrowserContextStorageState extends TestBase {
 
@@ -276,4 +277,12 @@ void shouldSupportIndexedDB() {
     assertEquals("{\"cookies\":[],\"origins\":[]}", context.storageState(
       new BrowserContext.StorageStateOptions().setIndexedDB(false)));
   }
+
+  @Test
+  void setStorageStateShouldHandleMissingFile(@TempDir Path tempDir) {
+    Path file = tempDir.resolve("does-not-exist.json");
+    PlaywrightException e = org.junit.jupiter.api.Assertions.assertThrows(
+      PlaywrightException.class, () -> context.setStorageState(file));
+    assertTrue(e.getMessage().contains("Failed to read storage state from file"), e.getMessage());
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextWebAuthn.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextWebAuthn.java
new file mode 100644
index 000000000..20b0a39e3
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextWebAuthn.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.VirtualCredential;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.microsoft.playwright.Utils.mapOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestBrowserContextWebAuthn extends TestBase {
+  private static final String B64URL_TO_BYTES_JS =
+    "  const b64UrlToBytes = s => {\n" +
+    "    let str = s.replace(/-/g, '+').replace(/_/g, '/');\n" +
+    "    while (str.length % 4)\n" +
+    "      str += '=';\n" +
+    "    const bin = atob(str);\n" +
+    "    const u8 = new Uint8Array(bin.length);\n" +
+    "    for (let i = 0; i < bin.length; i++)\n" +
+    "      u8[i] = bin.charCodeAt(i);\n" +
+    "    return u8;\n" +
+    "  };\n";
+
+  @Test
+  void shouldNotInterceptNavigatorCredentialsWithoutInstall() {
+    // Seed a credential, but do not install the interceptor.
+    context.credentials().create("localhost");
+    page.navigate(server.EMPTY_PAGE);
+
+    Object intercepted = page.evaluate("() => globalThis.__pwWebAuthnInstalled === true");
+    assertEquals(false, intercepted);
+  }
+
+  @Test
+  void shouldSeedKnownCredentialAndAuthenticate() {
+    // This is the easiest way to create credentials. In practice, this
+    // probably comes from environment.
+    VirtualCredential known;
+    try (BrowserContext source = browser.newContext()) {
+      known = source.credentials().create("localhost");
+    }
+
+    // A fresh context imports the known credential and signs in with it.
+    context.credentials().create(known.rpId, new Credentials.CreateOptions()
+      .setId(known.id)
+      .setUserHandle(known.userHandle)
+      .setPrivateKey(known.privateKey)
+      .setPublicKey(known.publicKey));
+    context.credentials().install();
+    page.navigate(server.EMPTY_PAGE);
+
+    Map<String, Object> result = (Map<String, Object>) page.evaluate(
+      "async ({ rpId, credentialId }) => {\n" +
+      B64URL_TO_BYTES_JS +
+      "  const challenge = crypto.getRandomValues(new Uint8Array(32));\n" +
+      "  const cred = await navigator.credentials.get({\n" +
+      "    publicKey: {\n" +
+      "      challenge,\n" +
+      "      rpId,\n" +
+      "      allowCredentials: [{ type: 'public-key', id: b64UrlToBytes(credentialId) }],\n" +
+      "      userVerification: 'preferred',\n" +
+      "    },\n" +
+      "  });\n" +
+      "  const resp = cred.response;\n" +
+      "  return {\n" +
+      "    id: cred.id,\n" +
+      "    type: cred.type,\n" +
+      "    hasClientData: resp.clientDataJSON.byteLength > 0,\n" +
+      "    hasAuthData: resp.authenticatorData.byteLength > 0,\n" +
+      "    hasSignature: resp.signature.byteLength > 0,\n" +
+      "    authDataFlags: new Uint8Array(resp.authenticatorData)[32],\n" +
+      "  };\n" +
+      "}", mapOf("rpId", "localhost", "credentialId", known.id));
+
+    assertEquals(known.id, result.get("id"));
+    assertEquals("public-key", result.get("type"));
+    assertEquals(true, result.get("hasClientData"));
+    assertEquals(true, result.get("hasAuthData"));
+    assertEquals(true, result.get("hasSignature"));
+    // UP (0x01) | UV (0x04) = 0x05
+    assertEquals(0x05, ((Number) result.get("authDataFlags")).intValue() & 0x05);
+
+    // After the credential is deleted, the page can no longer authenticate with it.
+    context.credentials().delete(known.id);
+    assertEquals(0, context.credentials().get().size());
+
+    Object error = page.evaluate(
+      "async ({ rpId, credentialId }) => {\n" +
+      B64URL_TO_BYTES_JS +
+      "  const challenge = crypto.getRandomValues(new Uint8Array(32));\n" +
+      "  try {\n" +
+      "    await navigator.credentials.get({\n" +
+      "      publicKey: {\n" +
+      "        challenge,\n" +
+      "        rpId,\n" +
+      "        allowCredentials: [{ type: 'public-key', id: b64UrlToBytes(credentialId) }],\n" +
+      "      },\n" +
+      "    });\n" +
+      "    return 'no-error';\n" +
+      "  } catch (e) {\n" +
+      "    return e.name;\n" +
+      "  }\n" +
+      "}", mapOf("rpId", "localhost", "credentialId", known.id));
+    assertEquals("NotAllowedError", error);
+  }
+
+  @Test
+  void shouldCapturePageCreatedCredentialAndReuseItInAnotherContext() {
+    // Setup context: the app registers a passkey via navigator.credentials.create().
+    String createdId;
+    VirtualCredential captured;
+    try (BrowserContext setupContext = browser.newContext()) {
+      setupContext.credentials().install();
+      Page setupPage = setupContext.newPage();
+      setupPage.navigate(server.EMPTY_PAGE);
+
+      createdId = (String) setupPage.evaluate(
+        "async ({ rpId }) => {\n" +
+        "  const challenge = crypto.getRandomValues(new Uint8Array(32));\n" +
+        "  const created = await navigator.credentials.create({\n" +
+        "    publicKey: {\n" +
+        "      challenge,\n" +
+        "      rp: { id: rpId, name: 'Test RP' },\n" +
+        "      user: { id: new Uint8Array([1, 2, 3, 4]), name: 'u', displayName: 'User' },\n" +
+        "      pubKeyCredParams: [{ type: 'public-key', alg: -7 }],\n" +
+        "      authenticatorSelection: { residentKey: 'required', userVerification: 'preferred' },\n" +
+        "    },\n" +
+        "  });\n" +
+        "  return created.id;\n" +
+        "}", mapOf("rpId", "localhost"));
+
+      List<VirtualCredential> credentials = setupContext.credentials().get(
+        new Credentials.GetOptions().setRpId("localhost"));
+      assertEquals(1, credentials.size());
+      captured = credentials.get(0);
+      assertEquals(createdId, captured.id);
+      assertTrue(captured.privateKey.matches("^[A-Za-z0-9_-]+$"), captured.privateKey);
+      assertTrue(captured.publicKey.matches("^[A-Za-z0-9_-]+$"), captured.publicKey);
+    }
+
+    // Reuse the captured passkey in a fresh context and sign in with it.
+    context.credentials().create(captured.rpId, new Credentials.CreateOptions()
+      .setId(captured.id)
+      .setUserHandle(captured.userHandle)
+      .setPrivateKey(captured.privateKey)
+      .setPublicKey(captured.publicKey));
+    context.credentials().install();
+    page.navigate(server.EMPTY_PAGE);
+
+    Object gotId = page.evaluate(
+      "async ({ rpId }) => {\n" +
+      "  const challenge = crypto.getRandomValues(new Uint8Array(32));\n" +
+      "  // No allowCredentials — relies on the re-seeded credential being discoverable.\n" +
+      "  const cred = await navigator.credentials.get({\n" +
+      "    publicKey: { challenge, rpId, userVerification: 'preferred' },\n" +
+      "  });\n" +
+      "  return cred.id;\n" +
+      "}", mapOf("rpId", "localhost"));
+
+    assertEquals(createdId, gotId);
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
index 08522ffee..1d81dd6b1 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
@@ -40,10 +40,14 @@ void browserTypeNameShouldWork() {
     assertEquals(getBrowserNameFromEnv(), browserType.name());
   }
 
+  static boolean isChromiumOrWebKit() {
+    return isChromium() || isWebKit();
+  }
+
   @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Non-chromium behavior")
+  @DisabledIf(value="isChromiumOrWebKit", disabledReason="Connecting over CDP is supported in Chromium and WebKit")
   void shouldThrowWhenTryingToConnectWithNotChromium() {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> browserType.connectOverCDP("foo"));
-    assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium."));
+    assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium and WebKit."));
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
index 618a36604..191d98da7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
@@ -259,7 +259,11 @@ void shouldThrowWhenCallingWaitForNavigationAfterDisconnect() throws Interrupted
     }
     assertFalse(browser.isConnected());
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.waitForNavigation(() -> {}));
-    assertTrue(e.getMessage().contains("Browser closed") || e.getMessage().contains("Page closed") || e.getMessage().contains("Browser has been closed"), e.getMessage());
+    // The surfaced message depends on which call hits the closed connection first.
+    assertTrue(e.getMessage().contains("Browser closed") ||
+      e.getMessage().contains("Page closed") ||
+      e.getMessage().contains("Browser has been closed") ||
+      e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
   @Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClick.java b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
index 8dfce5462..4c9086c89 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestClick.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
@@ -355,9 +355,8 @@ void shouldClickTheButtonWithPxBorderWithOffset() {
     page.evalOnSelector("button", "button => button.style.borderWidth = '8px'");
     page.click("button", new Page.ClickOptions().setPosition(20, 10));
     assertEquals(page.evaluate("result"), "Clicked");
-    // Safari reports border-relative offsetX/offsetY.
-    assertEquals(isWebKit() ? 20 + 8 : 20, page.evaluate("offsetX"));
-    assertEquals(isWebKit() ? 10 + 8 : 10, page.evaluate("offsetY"));
+    assertEquals(20, page.evaluate("offsetX"));
+    assertEquals(10, page.evaluate("offsetY"));
   }
 
   @Test
@@ -367,9 +366,8 @@ void shouldClickTheButtonWithEmBorderWithOffset() {
     page.evalOnSelector("button", "button => button.style.fontSize = '12px'");
     page.click("button", new Page.ClickOptions().setPosition(20, 10));
     assertEquals("Clicked", page.evaluate("result"));
-    // Safari reports border-relative offsetX/offsetY.
-    assertEquals(isWebKit() ? 12 * 2 + 20 : 20, page.evaluate("offsetX"));
-    assertEquals(isWebKit() ? 12 * 2 + 10 : 10, page.evaluate("offsetY"));
+    assertEquals(20, page.evaluate("offsetX"));
+    assertEquals(10, page.evaluate("offsetY"));
   }
 
   @Test
@@ -379,9 +377,8 @@ void shouldClickAVeryLargeButtonWithOffset() {
     page.evalOnSelector("button", "button => button.style.height = button.style.width = '2000px'");
     page.click("button", new Page.ClickOptions().setPosition(1900, 1910));
     assertEquals("Clicked", page.evaluate("() => window['result']"));
-    // Safari reports border-relative offsetX/offsetY.
-    assertEquals(isWebKit() ? 1900 + 8 : 1900, page.evaluate("offsetX"));
-    assertEquals(isWebKit() ? 1910 + 8 : 1910, page.evaluate("offsetY"));
+    assertEquals(1900, page.evaluate("offsetX"));
+    assertEquals(1910, page.evaluate("offsetY"));
   }
 
   @Test
@@ -400,9 +397,8 @@ void shouldClickAButtonInScrollingContainerWithOffset() {
       "}");
     page.click("button", new Page.ClickOptions().setPosition(1900, 1910));
     assertEquals("Clicked", page.evaluate("() => window['result']"));
-    // Safari reports border-relative offsetX/offsetY.
-    assertEquals(isWebKit() ? 1900 + 8 : 1900, page.evaluate("offsetX"));
-    assertEquals(isWebKit() ? 1910 + 8 : 1910, page.evaluate("offsetY"));
+    assertEquals(1900, page.evaluate("offsetX"));
+    assertEquals(1910, page.evaluate("offsetY"));
   }
 
   private static void expectCloseTo(double expected, double actual) {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java b/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java
index f6028c6ee..90c6336ca 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
@@ -223,7 +224,9 @@ public void shouldWorkWithBrowserNewPageWhenPassingAsContent() throws IOExceptio
 
   @Test
   @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
-  public void shouldWorkWithBrowserLaunchPersistentContext(@TempDir Path tmpDir) {
+  // No cleanup: on Windows Chromium may keep chrome_debug.log in the user data dir
+  // locked briefly after close, failing the deletion.
+  public void shouldWorkWithBrowserLaunchPersistentContext(@TempDir(cleanup = CleanupMode.NEVER) Path tmpDir) {
     BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDebugger.java b/playwright/src/test/java/com/microsoft/playwright/TestDebugger.java
new file mode 100644
index 000000000..91961d1c5
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDebugger.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.DebuggerPausedDetails;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestDebugger extends TestBase {
+  @Test
+  void shouldReturnNullPausedDetailsInitially() {
+    Debugger dbg = context.debugger();
+    assertNull(dbg.pausedDetails());
+  }
+
+  @Test
+  void shouldPauseAtNextAndResume() {
+    page.setContent("<div>click me</div>");
+    Debugger dbg = context.debugger();
+    assertNull(dbg.pausedDetails());
+
+    dbg.requestPause();
+
+    boolean[] paused = {false};
+    dbg.onPausedStateChanged(() -> {
+      if (!paused[0]) {
+        paused[0] = true;
+        DebuggerPausedDetails details = dbg.pausedDetails();
+        assertNotNull(details);
+        assertTrue(details.title.contains("Click"), "title: " + details.title);
+        dbg.resume();
+      }
+    });
+
+    page.click("div"); // blocks until dbg.resume() is called
+    assertNull(dbg.pausedDetails());
+  }
+
+  @Test
+  void shouldStepWithNext() {
+    page.setContent("<div>click me</div>");
+    Debugger dbg = context.debugger();
+    assertNull(dbg.pausedDetails());
+
+    dbg.requestPause();
+
+    boolean[] paused = {false};
+    dbg.onPausedStateChanged(() -> {
+      if (!paused[0]) {
+        paused[0] = true;
+        DebuggerPausedDetails details = dbg.pausedDetails();
+        assertNotNull(details);
+        assertTrue(details.title.contains("Click"), "title: " + details.title);
+        dbg.next();
+      } else if (dbg.pausedDetails() != null) {
+        dbg.resume();
+      }
+    });
+
+    page.click("div");
+    assertNull(dbg.pausedDetails());
+  }
+
+  @Test
+  void shouldPauseAtPauseCall() {
+    page.setContent("<div>click me</div>");
+    Debugger dbg = context.debugger();
+    assertNull(dbg.pausedDetails());
+
+    dbg.requestPause();
+
+    boolean[] paused = {false};
+    dbg.onPausedStateChanged(() -> {
+      if (!paused[0]) {
+        paused[0] = true;
+        DebuggerPausedDetails details = dbg.pausedDetails();
+        assertNotNull(details);
+        assertTrue(details.title.contains("Pause"), "title: " + details.title);
+        dbg.resume();
+      }
+    });
+
+    page.pause(); // blocks until dbg.resume() is called from event handler
+    assertNull(dbg.pausedDetails());
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
index 6c03accb1..458738b37 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
@@ -46,10 +47,12 @@ public class TestDefaultBrowserContext2 extends TestBase {
 
 
   private BrowserContext persistentContext;
-  @TempDir Path tempDir;
+  // No cleanup: on Windows Chromium may keep chrome_debug.log in the user data dir
+  // locked briefly after close, failing the deletion.
+  @TempDir(cleanup = CleanupMode.NEVER) Path tempDir;
 
   @AfterEach
-  private void closePersistentContext() {
+  void closePersistentContext() {
     if (persistentContext != null) {
       persistentContext.close();
       persistentContext = null;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java b/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java
index ce9e21f48..37fc6e59f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java
@@ -22,6 +22,7 @@
 import com.microsoft.playwright.options.HttpCredentialsSend;
 import com.microsoft.playwright.options.HttpHeader;
 import com.microsoft.playwright.options.RequestOptions;
+import com.microsoft.playwright.options.ServerAddr;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -252,6 +253,25 @@ void shouldPropagateIgnoreHTTPSErrorsOnRedirects() {
     assertEquals(200, response.status());
   }
 
+  @Test
+  void shouldReturnServerAddressFromResponse() {
+    APIRequestContext request = playwright.request().newContext();
+    APIResponse response = request.get(server.EMPTY_PAGE);
+    ServerAddr address = response.serverAddr();
+    assertNotNull(address);
+    assertEquals(server.PORT, address.port);
+    assertTrue(asList("127.0.0.1", "::1").contains(address.ipAddress), address.ipAddress);
+    request.dispose();
+  }
+
+  @Test
+  void shouldReturnNullSecurityDetailsForHttpResponse() {
+    APIRequestContext request = playwright.request().newContext();
+    APIResponse response = request.get(server.EMPTY_PAGE);
+    assertNull(response.securityDetails());
+    request.dispose();
+  }
+
   @Test
   void shouldResolveUrlRelativeToGobalBaseURLOption() {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setBaseURL(server.PREFIX));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java
index a836a9117..395e595b8 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java
@@ -17,12 +17,15 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.options.KeyboardModifier;
+import com.microsoft.playwright.options.ScrollMode;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static java.util.Arrays.asList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
+@Tag("smoke")
 public class TestLocatorClick extends TestBase {
 
   @Test
@@ -65,4 +68,61 @@ void shouldSupportCotrolOrMetaModifier() {
       page.getByText("Go").click(new Locator.ClickOptions().setModifiers(asList(KeyboardModifier.CONTROLORMETA))));
     assertThat(newPage).hasURL(server.PREFIX + "/title.html");
   }
+
+  @Test
+  void shouldClickWithTweenedMouseMovement() {
+    page.setContent(
+      "<body style=\"margin: 0; padding: 0; height: 500px; width: 500px;\">\n" +
+      "  <div style=\"position: relative; top: 280px; left: 150px; width: 100px; height: 40px\">Click me</div>\n" +
+      "</body>"
+    );
+
+    // The test becomes flaky on WebKit without next line.
+    if (isWebKit()) {
+      page.evaluate("() => new Promise(requestAnimationFrame)");
+    }
+
+    page.mouse().move(100, 100);
+
+    page.evaluate("() => {\n" +
+      "  window['result'] = [];\n" +
+      "  document.addEventListener('mousemove', event => {\n" +
+      "    window['result'].push([event.clientX, event.clientY]);\n" +
+      "  });\n" +
+      "}");
+
+    // Centerpoint at 150 + 100/2, 280 + 40/2 = 200, 300
+    page.locator("div").click(new Locator.ClickOptions().setSteps(5));
+
+    assertEquals(
+      asList(
+        asList(120, 140),
+        asList(140, 180),
+        asList(160, 220),
+        asList(180, 260),
+        asList(200, 300)
+      ),
+      page.evaluate("result")
+    );
+  }
+
+  @Test
+  void shouldNotScrollWhenScrollIsNone() {
+    page.setContent("<div style='height: 2000px;'>filler</div>\n" +
+      "<button onclick='window._clicked=true'>click me</button>");
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> page.locator("button").click(new Locator.ClickOptions().setScroll(ScrollMode.NONE).setTimeout(2000)));
+    assertTrue(e.getMessage().contains("element is outside of the viewport"), e.getMessage());
+    assertNull(page.evaluate("window._clicked"));
+    assertEquals(0, page.evaluate("() => window.scrollY"));
+  }
+
+  @Test
+  void shouldClickInViewportElementWhenScrollIsNone() {
+    page.setContent("<button onclick='window._clicked=true'>click me</button>\n" +
+      "<div style='height: 2000px;'></div>");
+    page.locator("button").click(new Locator.ClickOptions().setScroll(ScrollMode.NONE).setTimeout(2000));
+    assertEquals(true, page.evaluate("window._clicked"));
+    assertEquals(0, page.evaluate("() => window.scrollY"));
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java
index 16bdfc867..add338260 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java
@@ -186,4 +186,53 @@ void allInnerTextsShouldWork() {
     page.setContent("<div>A</div><div>B</div><div>C</div>");
     assertEquals(asList("A", "B", "C"), page.locator("div").allInnerTexts());
   }
+
+  @Test
+  void descriptionShouldReturnNullForUndescribedLocators() {
+    page.setContent("<div>Hello</div>");
+    Locator locator = page.locator("div");
+    assertNull(locator.description());
+  }
+
+  @Test
+  void descriptionShouldReturnSimpleDescription() {
+    page.setContent("<div>Hello</div>");
+    Locator locator = page.locator("div").describe("my div");
+    assertEquals("my div", locator.description());
+  }
+
+  @Test
+  void descriptionShouldHandleSpecialCharacters() {
+    page.setContent("<div>Hello</div>");
+    Locator locator = page.locator("div").describe("título 😊");
+    assertEquals("título 😊", locator.description());
+  }
+
+  @Test
+  void descriptionShouldWorkWithChainedLocators() {
+    page.setContent("<div><span>Hello</span></div>");
+    Locator locator = page.locator("div").describe("container").locator("span");
+    assertNull(locator.description());
+  }
+
+  @Test
+  void descriptionShouldReturnLastDescriptionForMultipleCalls() {
+    page.setContent("<div>Hello</div>");
+    Locator locator = page.locator("div").describe("first").describe("second");
+    assertEquals("second", locator.description());
+  }
+
+  @Test
+  void toStringShouldReturnFormattedLocator() {
+    page.setContent("<div>Hello</div>");
+    Locator locator = page.locator("div");
+    assertTrue(locator.toString().startsWith("Locator@"));
+  }
+
+  @Test
+  void toStringShouldPreferDescription() {
+    page.setContent("<div>Hello</div>");
+    Locator locator = page.locator("div").describe("my div");
+    assertEquals("my div", locator.toString());
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java
index ecc04c4f2..c85226cc0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java
@@ -36,4 +36,18 @@ void shouldHighlightLocator() {
     BoundingBox box2 = page.locator("x-pw-highlight").boundingBox();
     assertEquals(new Gson().toJson(box2), new Gson().toJson(box1));
   }
+
+  @Test
+  void highlightAndHideHighlightShouldNotThrow() {
+    page.setContent("<input type='text' />");
+    AutoCloseable disposable = page.locator("input").highlight(new Locator.HighlightOptions().setStyle("outline: 2px dashed red"));
+    try {
+      disposable.close();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+    page.locator("input").highlight();
+    page.locator("input").hideHighlight();
+    page.hideHighlight();
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java
index 5e057ffdc..43cca0091 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java
@@ -140,4 +140,49 @@ public void shouldSupportFilterVisible() {
     assertThat(page.locator(".item").filter(new Locator.FilterOptions().setVisible(true)).getByText("data3")).hasText("visible data3");
     assertThat(page.locator(".item").filter(new Locator.FilterOptions().setVisible(false)).getByText("data1")).hasText("Hidden data1");
   }
+
+  @Test
+  void waitForFunctionShouldWaitForAnAttributeToAppear() {
+    page.setContent("<button id=toggle>Menu</button>");
+    page.evaluate("() => setTimeout(() => document.querySelector('#toggle').setAttribute('aria-expanded', 'true'), 500)");
+    page.locator("#toggle").waitForFunction("element => element.hasAttribute('aria-expanded')");
+  }
+
+  @Test
+  void waitForFunctionShouldReturnImmediatelyWhenAlreadyTruthy() {
+    page.setContent("<div id=target>yes</div>");
+    page.locator("#target").waitForFunction("element => element.textContent === 'yes'");
+  }
+
+  @Test
+  void waitForFunctionShouldAcceptElementHandleArguments() {
+    page.setContent("<div id=a></div><div id=b>value</div>");
+    ElementHandle handle = page.querySelector("#b");
+    page.locator("#a").waitForFunction("(element, other) => other.textContent === 'value'", handle);
+  }
+
+  @Test
+  void waitForFunctionShouldThrowWhenPredicateThrows() {
+    page.setContent("<div id=target>no</div>");
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> page.locator("#target").waitForFunction("() => { throw new Error('oh my'); }"));
+    assertTrue(e.getMessage().contains("oh my"), e.getMessage());
+  }
+
+  @Test
+  void waitForFunctionShouldThrowOnStrictModeViolation() {
+    page.setContent("<div class=x>1</div><div class=x>2</div>");
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> page.locator("div.x").waitForFunction("() => true"));
+    assertTrue(e.getMessage().contains("strict mode violation"), e.getMessage());
+  }
+
+  @Test
+  void waitForFunctionShouldRespectTimeout() {
+    page.setContent("<div id=target>no</div>");
+    PlaywrightException e = assertThrows(PlaywrightException.class,
+      () -> page.locator("#target").waitForFunction("element => element.textContent === 'yes'", null,
+        new Locator.WaitForFunctionOptions().setTimeout(500)));
+    assertTrue(e.getMessage().contains("Timeout 500ms exceeded"), e.getMessage());
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java
index 6891d6aa8..442f2cd01 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java
@@ -136,4 +136,219 @@ void matchValuesBothAgainstRegexAndString(Page page) {
       "  - /url: /auth?r=/");
   }
 
+  @Test
+  void shouldSnapshotIntegration(Page page) {
+    page.setContent(
+      "<h1>Microsoft</h1>" +
+      "<div>Open source projects and samples from Microsoft</div>" +
+      "<ul>" +
+      "<li><details><summary>Verified</summary><div><div>" +
+      "<p>We've verified that the organization <strong>microsoft</strong> controls the domain:</p>" +
+      "<ul><li class=\"mb-1\"><strong>opensource.microsoft.com</strong></li></ul>" +
+      "<div><a href=\"about: blank\">Learn more about verified organizations</a></div>" +
+      "</div></div></details></li>" +
+      "<li><a href=\"about:blank\"><summary title=\"Label: GitHub Sponsor\">Sponsor</summary></a></li>" +
+      "</ul>");
+    checkAndMatchSnapshot(page.locator("body"),
+      "- heading \"Microsoft\" [level=1]\n" +
+      "- text: Open source projects and samples from Microsoft\n" +
+      "- list:\n" +
+      "  - listitem:\n" +
+      "    - group: Verified\n" +
+      "  - listitem:\n" +
+      "    - link \"Sponsor\":\n" +
+      "      - /url: about:blank");
+  }
+
+  @Test
+  void shouldSupportMultilineText(Page page) {
+    page.setContent("<p>\n      Line 1\n      Line 2\n      Line 3\n    </p>");
+    checkAndMatchSnapshot(page.locator("body"), "- paragraph: Line 1 Line 2 Line 3");
+    assertThat(page.locator("body")).matchesAriaSnapshot(
+      "    - paragraph: |\n" +
+      "        Line 1\n" +
+      "        Line 2\n" +
+      "        Line 3");
+  }
+
+  @Test
+  void shouldConcatenateSpanText(Page page) {
+    page.setContent("<span>One</span> <span>Two</span> <span>Three</span>");
+    checkAndMatchSnapshot(page.locator("body"), "- text: One Two Three");
+  }
+
+  @Test
+  void shouldConcatenateSpanText2(Page page) {
+    page.setContent("<span>One </span><span>Two </span><span>Three</span>");
+    checkAndMatchSnapshot(page.locator("body"), "- text: One Two Three");
+  }
+
+  @Test
+  void shouldConcatenateDivTextWithSpaces(Page page) {
+    page.setContent("<div>One</div><div>Two</div><div>Three</div>");
+    checkAndMatchSnapshot(page.locator("body"), "- text: One Two Three");
+  }
+
+  @Test
+  void shouldIncludePseudoInText(Page page) {
+    page.setContent(
+      "<style>span:before { content: 'world'; } div:after { content: 'bye'; }</style>" +
+      "<a href=\"about:blank\"><span>hello</span><div>hello</div></a>");
+    checkAndMatchSnapshot(page.locator("body"),
+      "- link \"worldhello hellobye\":\n" +
+      "  - /url: about:blank");
+  }
+
+  @Test
+  void shouldNotIncludeHiddenPseudoInText(Page page) {
+    page.setContent(
+      "<style>span:before { content: 'world'; display: none; } div:after { content: 'bye'; visibility: hidden; }</style>" +
+      "<a href=\"about:blank\"><span>hello</span><div>hello</div></a>");
+    checkAndMatchSnapshot(page.locator("body"),
+      "- link \"hello hello\":\n" +
+      "  - /url: about:blank");
+  }
+
+  @Test
+  void shouldIncludeNewLineForBlockPseudo(Page page) {
+    page.setContent(
+      "<style>span:before { content: 'world'; display: block; } div:after { content: 'bye'; display: block; }</style>" +
+      "<a href=\"about:blank\"><span>hello</span><div>hello</div></a>");
+    checkAndMatchSnapshot(page.locator("body"),
+      "- link \"world hello hello bye\":\n" +
+      "  - /url: about:blank");
+  }
+
+  @Test
+  void shouldWorkWithSlots(Page page) {
+    // Text "foo" is assigned to the slot, should not be used twice.
+    page.setContent(
+      "<button><div>foo</div></button>" +
+      "<script>(() => {" +
+      "  const container = document.querySelector('div');" +
+      "  const shadow = container.attachShadow({ mode: 'open' });" +
+      "  const slot = document.createElement('slot');" +
+      "  shadow.appendChild(slot);" +
+      "})()</script>");
+    checkAndMatchSnapshot(page.locator("body"), "- button \"foo\"");
+
+    // Text "foo" is assigned to the slot, should be used instead of slot content.
+    page.setContent(
+      "<div>foo</div>" +
+      "<script>(() => {" +
+      "  const container = document.querySelector('div');" +
+      "  const shadow = container.attachShadow({ mode: 'open' });" +
+      "  const button = document.createElement('button');" +
+      "  shadow.appendChild(button);" +
+      "  const slot = document.createElement('slot');" +
+      "  button.appendChild(slot);" +
+      "  const span = document.createElement('span');" +
+      "  span.textContent = 'pre';" +
+      "  slot.appendChild(span);" +
+      "})()</script>");
+    checkAndMatchSnapshot(page.locator("body"), "- button \"foo\"");
+
+    // Nothing is assigned to the slot, should use slot content.
+    page.setContent(
+      "<div></div>" +
+      "<script>(() => {" +
+      "  const container = document.querySelector('div');" +
+      "  const shadow = container.attachShadow({ mode: 'open' });" +
+      "  const button = document.createElement('button');" +
+      "  shadow.appendChild(button);" +
+      "  const slot = document.createElement('slot');" +
+      "  button.appendChild(slot);" +
+      "  const span = document.createElement('span');" +
+      "  span.textContent = 'pre';" +
+      "  slot.appendChild(span);" +
+      "})()</script>");
+    checkAndMatchSnapshot(page.locator("body"), "- button \"pre\"");
+  }
+
+  @Test
+  void shouldSnapshotInnerText(Page page) {
+    page.setContent(
+      "<div role=\"listitem\"><div><div><span title=\"a.test.ts\">a.test.ts</span></div>" +
+      "<div><button title=\"Run\"></button><button title=\"Show source\"></button><button title=\"Watch\"></button></div></div></div>" +
+      "<div role=\"listitem\"><div><div><span title=\"snapshot\">snapshot</span></div>" +
+      "<div class=\"ui-mode-list-item-time\">30ms</div>" +
+      "<div><button title=\"Run\"></button><button title=\"Show source\"></button><button title=\"Watch\"></button></div></div></div>");
+    checkAndMatchSnapshot(page.locator("body"),
+      "    - listitem:\n" +
+      "      - text: a.test.ts\n" +
+      "      - button \"Run\"\n" +
+      "      - button \"Show source\"\n" +
+      "      - button \"Watch\"\n" +
+      "    - listitem:\n" +
+      "      - text: snapshot 30ms\n" +
+      "      - button \"Run\"\n" +
+      "      - button \"Show source\"\n" +
+      "      - button \"Watch\"");
+  }
+
+  @Test
+  void checkAriaHiddenText(Page page) {
+    page.setContent("<p><span>hello</span><span aria-hidden=\"true\">world</span></p>");
+    checkAndMatchSnapshot(page.locator("body"), "- paragraph: hello");
+  }
+
+  @Test
+  void shouldIgnorePresentationAndNoneRoles(Page page) {
+    page.setContent("<ul><li role=\"presentation\">hello</li><li role=\"none\">world</li></ul>");
+    checkAndMatchSnapshot(page.locator("body"), "- list: hello world");
+  }
+
+  @Test
+  void shouldNotUseOnAsCheckboxValue(Page page) {
+    page.setContent("<input type=\"checkbox\"><input type=\"radio\">");
+    checkAndMatchSnapshot(page.locator("body"), "- checkbox\n- radio");
+  }
+
+  @Test
+  void shouldNotReportTextareaTextContent(Page page) {
+    page.setContent("<textarea>Before</textarea>");
+    checkAndMatchSnapshot(page.locator("body"), "- textbox: Before");
+    page.evaluate("document.querySelector('textarea').value = 'After'");
+    checkAndMatchSnapshot(page.locator("body"), "- textbox: After");
+  }
+
+  @Test
+  void shouldNotShowVisibleChildrenOfHiddenElements(Page page) {
+    page.setContent(
+      "<div style=\"visibility: hidden;\">" +
+      "<div style=\"visibility: visible;\"><button>Button</button></div>" +
+      "</div>");
+    assertEquals("", page.locator("body").ariaSnapshot());
+  }
+
+  @Test
+  void shouldNotShowUnhiddenChildrenOfAriaHiddenElements(Page page) {
+    page.setContent(
+      "<div aria-hidden=\"true\">" +
+      "<div aria-hidden=\"false\"><button>Button</button></div>" +
+      "</div>");
+    assertEquals("", page.locator("body").ariaSnapshot());
+  }
+
+  @Test
+  void shouldSnapshotPlaceholderWhenDifferentFromName(Page page) {
+    page.setContent("<input placeholder=\"Placeholder\">");
+    assertThat(page.locator("body")).matchesAriaSnapshot("- textbox \"Placeholder\"");
+
+    page.setContent("<input placeholder=\"Placeholder\" aria-label=\"Label\">");
+    assertThat(page.locator("body")).matchesAriaSnapshot(
+      "- textbox \"Label\":\n" +
+      "  - /placeholder: Placeholder");
+  }
+
+  @Test
+  void pageMatchesAriaSnapshot(Page page) {
+    page.setContent("<h1>hello</h1>");
+    assertThat(page).matchesAriaSnapshot("- heading \"hello\" [level=1]");
+    AssertionFailedError e = assertThrows(AssertionFailedError.class,
+      () -> assertThat(page).matchesAriaSnapshot("- heading \"world\"",
+        new com.microsoft.playwright.assertions.PageAssertions.MatchesAriaSnapshotOptions().setTimeout(1000)));
+    org.junit.jupiter.api.Assertions.assertTrue(e.getMessage().contains("Page expected to match Aria snapshot"), e.getMessage());
+  }
+
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshotAI.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshotAI.java
new file mode 100644
index 000000000..ec5bc660e
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshotAI.java
@@ -0,0 +1,194 @@
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.junit.FixtureTest;
+import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.options.AriaSnapshotMode;
+import org.junit.jupiter.api.Test;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+@FixtureTest
+@UsePlaywright
+public class TestPageAriaSnapshotAI {
+  private static String aiSnapshot(Page page) {
+    return page.ariaSnapshot(new Page.AriaSnapshotOptions().setMode(AriaSnapshotMode.AI));
+  }
+
+  @Test
+  void shouldGenerateRefs(Page page) {
+    page.setContent("<button>One</button><button>Two</button><button>Three</button>");
+
+    String snapshot1 = aiSnapshot(page);
+    assertTrue(snapshot1.contains("button \"One\" [ref=e2]"), snapshot1);
+    assertTrue(snapshot1.contains("button \"Two\" [ref=e3]"), snapshot1);
+    assertTrue(snapshot1.contains("button \"Three\" [ref=e4]"), snapshot1);
+    assertThat(page.locator("aria-ref=e2")).hasText("One");
+    assertThat(page.locator("aria-ref=e3")).hasText("Two");
+    assertThat(page.locator("aria-ref=e4")).hasText("Three");
+
+    page.locator("aria-ref=e3").evaluate("e => e.textContent = 'Not Two'");
+
+    String snapshot2 = aiSnapshot(page);
+    assertTrue(snapshot2.contains("button \"One\" [ref=e2]"), snapshot2);
+    assertTrue(snapshot2.contains("button \"Not Two\" [ref=e5]"), snapshot2);
+    assertTrue(snapshot2.contains("button \"Three\" [ref=e4]"), snapshot2);
+  }
+
+  @Test
+  void shouldListIframes(Page page) {
+    page.setContent(
+      "<h1>Hello</h1>" +
+      "<iframe name=\"foo\" src=\"data:text/html,<h1>World</h1>\">");
+
+    String snapshot = aiSnapshot(page);
+    assertTrue(snapshot.contains("- iframe"), snapshot);
+
+    String frameSnapshot = page.frameLocator("iframe").locator("body").ariaSnapshot();
+    assertEquals("- heading \"World\" [level=1]", frameSnapshot);
+  }
+
+  @Test
+  void shouldSnapshotLocatorInsideIframe(Page page) {
+    page.setContent(
+      "<h1>Main Page</h1>" +
+      "<iframe srcdoc=\"<ul><li>Item 1</li><li>Item 2</li></ul>\"></iframe>");
+
+    Locator list = page.frames().get(1).locator("ul");
+    String snapshot = list.ariaSnapshot(new Locator.AriaSnapshotOptions().setMode(AriaSnapshotMode.AI));
+    assertTrue(snapshot.contains("list [ref=f1e1]"), snapshot);
+    assertTrue(snapshot.contains("listitem [ref=f1e2]: Item 1"), snapshot);
+    assertTrue(snapshot.contains("listitem [ref=f1e3]: Item 2"), snapshot);
+  }
+
+  @Test
+  void shouldCollapseGenericNodes(Page page) {
+    page.setContent("<div><div><div><button>Button</button></div></div></div>");
+    String snapshot = aiSnapshot(page);
+    assertTrue(snapshot.contains("button \"Button\" [ref=e5]"), snapshot);
+  }
+
+  @Test
+  void shouldIncludeCursorPointerHint(Page page) {
+    page.setContent("<button style=\"cursor: pointer\">Button</button>");
+    String snapshot = aiSnapshot(page);
+    assertTrue(snapshot.contains("button \"Button\" [ref=e2] [cursor=pointer]"), snapshot);
+  }
+
+  @Test
+  void shouldNotNestCursorPointerHints(Page page) {
+    page.setContent(
+      "<a style=\"cursor: pointer\" href=\"about:blank\">" +
+      "Link with a button <button style=\"cursor: pointer\">Button</button>" +
+      "</a>");
+    String snapshot = aiSnapshot(page);
+    // The link's name is redundant - "Link with a button" prints as text and "Button" as the button -
+    // so it is dropped even though the node is clickable.
+    assertTrue(snapshot.contains("link [ref=e2] [cursor=pointer]"), snapshot);
+    assertTrue(snapshot.contains("text: Link with a button"), snapshot);
+    // The button inside a cursor-pointer link should not get a redundant [cursor=pointer]
+    assertTrue(snapshot.contains("button \"Button\" [ref=e3]"), snapshot);
+    assertFalse(snapshot.contains("button \"Button\" [ref=e3] [cursor=pointer]"), snapshot);
+  }
+
+  @Test
+  void shouldShowVisibleChildrenOfHiddenElements(Page page) {
+    page.setContent(
+      "<div style=\"visibility: hidden\">" +
+      "  <div style=\"visibility: visible\"><button>Visible</button></div>" +
+      "  <div style=\"visibility: hidden\"><button style=\"visibility: visible\">Visible</button></div>" +
+      "  <div>" +
+      "    <div style=\"visibility: visible\"><button style=\"visibility: hidden\">Hidden</button></div>" +
+      "    <button>Hidden</button>" +
+      "  </div>" +
+      "</div>");
+    String snapshot = aiSnapshot(page);
+    assertEquals(
+      "- generic [active] [ref=e1]:\n" +
+      "  - button \"Visible\" [ref=e3]\n" +
+      "  - button \"Visible\" [ref=e4]",
+      snapshot);
+  }
+
+  @Test
+  void shouldIncludeActiveElementInformation(Page page) {
+    page.setContent(
+      "<button id=\"btn1\">Button 1</button>" +
+      "<button id=\"btn2\" autofocus>Button 2</button>" +
+      "<div>Not focusable</div>");
+    page.waitForFunction("document.activeElement?.id === 'btn2'");
+
+    String snapshot = aiSnapshot(page);
+    assertTrue(snapshot.contains("button \"Button 2\" [active] [ref=e3]"), snapshot);
+    assertFalse(snapshot.contains("button \"Button 1\" [active]"), snapshot);
+  }
+
+  @Test
+  void shouldUpdateActiveElementOnFocus(Page page) {
+    page.setContent(
+      "<input id=\"input1\" placeholder=\"First input\">" +
+      "<input id=\"input2\" placeholder=\"Second input\">");
+
+    String initialSnapshot = aiSnapshot(page);
+    assertTrue(initialSnapshot.contains("textbox \"First input\" [ref=e2]"), initialSnapshot);
+    assertTrue(initialSnapshot.contains("textbox \"Second input\" [ref=e3]"), initialSnapshot);
+    assertFalse(initialSnapshot.contains("textbox \"First input\" [active]"), initialSnapshot);
+    assertFalse(initialSnapshot.contains("textbox \"Second input\" [active]"), initialSnapshot);
+
+    page.locator("#input2").focus();
+
+    String afterFocusSnapshot = aiSnapshot(page);
+    assertTrue(afterFocusSnapshot.contains("textbox \"Second input\" [active] [ref=e3]"), afterFocusSnapshot);
+    assertFalse(afterFocusSnapshot.contains("textbox \"First input\" [active]"), afterFocusSnapshot);
+  }
+
+  @Test
+  void shouldCollapseInlineGenericNodes(Page page) {
+    page.setContent(
+      "<ul>" +
+      "<li><b>3</b> <abbr>bds</abbr></li>" +
+      "<li><b>2</b> <abbr>ba</abbr></li>" +
+      "<li><b>1,200</b> <abbr>sqft</abbr></li>" +
+      "</ul>");
+    String snapshot = aiSnapshot(page);
+    assertTrue(snapshot.contains("listitem [ref=e3]: 3 bds"), snapshot);
+    assertTrue(snapshot.contains("listitem [ref=e4]: 2 ba"), snapshot);
+    assertTrue(snapshot.contains("listitem [ref=e5]: 1,200 sqft"), snapshot);
+  }
+
+  @Test
+  void shouldNotRemoveGenericNodesWithTitle(Page page) {
+    page.setContent("<div title=\"Element title\">Element content</div>");
+    String snapshot = aiSnapshot(page);
+    assertTrue(snapshot.contains("generic \"Element title\" [ref=e2]"), snapshot);
+  }
+
+  @Test
+  void shouldLimitDepth(Page page) {
+    page.setContent(
+      "<ul>" +
+      "<li>item1</li>" +
+      "<a href=\"about:blank\" style=\"cursor:pointer\">link</a>" +
+      "<li><ul id=\"target\"><li>item2</li><li><ul><li>item3</li></ul></li></ul></li>" +
+      "</ul>");
+
+    String snapshot1 = page.ariaSnapshot(new Page.AriaSnapshotOptions().setMode(AriaSnapshotMode.AI).setDepth(1));
+    assertTrue(snapshot1.contains("listitem [ref=e3]: item1"), snapshot1);
+    assertFalse(snapshot1.contains("item2"), snapshot1);
+    assertFalse(snapshot1.contains("item3"), snapshot1);
+
+    String snapshot2 = page.ariaSnapshot(new Page.AriaSnapshotOptions().setMode(AriaSnapshotMode.AI).setDepth(3));
+    assertTrue(snapshot2.contains("item1"), snapshot2);
+    assertTrue(snapshot2.contains("item2"), snapshot2);
+    assertFalse(snapshot2.contains("item3"), snapshot2);
+
+    String snapshot3 = page.ariaSnapshot(new Page.AriaSnapshotOptions().setMode(AriaSnapshotMode.AI).setDepth(100));
+    assertTrue(snapshot3.contains("item1"), snapshot3);
+    assertTrue(snapshot3.contains("item2"), snapshot3);
+    assertTrue(snapshot3.contains("item3"), snapshot3);
+
+    String snapshot4 = page.locator("#target").ariaSnapshot(new Locator.AriaSnapshotOptions().setMode(AriaSnapshotMode.AI).setDepth(1));
+    assertTrue(snapshot4.contains("listitem [ref=e7]: item2"), snapshot4);
+    assertFalse(snapshot4.contains("item3"), snapshot4);
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
index feb3c0ab4..e9c1fa7b2 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
@@ -30,6 +31,7 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
+@Tag("smoke")
 public class TestPageBasic extends TestBase {
 
   @Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java b/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java
index 32d210fd7..6a4e75b61 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java
@@ -124,4 +124,94 @@ void shouldWorkWithLocators() {
     page.locator("#source").dragTo(page.locator("#target"));
     assertEquals(true, page.evalOnSelector("#target", "target => target.contains(document.querySelector('#source'))"));
   }
+
+  @Test
+  void shouldDragAndDropWithTweenedMouseMovement() {
+    page.setContent(
+      "<body style='margin: 0; padding: 0;'>\n" +
+      "  <div style='width:100px;height:100px;background:red;' id='red'></div>\n" +
+      "  <div style='width:300px;height:100px;background:blue;' id='blue'></div>\n" +
+      "</body>"
+    );
+
+    JSHandle eventsHandle = page.evaluateHandle("() => {\n" +
+      "  const events = [];\n" +
+      "  document.addEventListener('mousedown', event => {\n" +
+      "    events.push({ type: 'mousedown', x: event.pageX, y: event.pageY });\n" +
+      "  });\n" +
+      "  document.addEventListener('mouseup', event => {\n" +
+      "    events.push({ type: 'mouseup', x: event.pageX, y: event.pageY });\n" +
+      "  });\n" +
+      "  document.addEventListener('mousemove', event => {\n" +
+      "    events.push({ type: 'mousemove', x: event.pageX, y: event.pageY });\n" +
+      "  });\n" +
+      "  return events;\n" +
+      "}");
+
+    // Red div center is at (50, 50), blue div center is at (150, 50)
+    // With 4 steps, we expect intermediate positions at (75, 50), (100, 50), (125, 50)
+    page.dragAndDrop("#red", "#blue", new Page.DragAndDropOptions().setSteps(4));
+
+    Object json = eventsHandle.jsonValue();
+    // Expected sequence: mousemove to (50,50), mousedown at (50,50),
+    // then 3 mousemove events at (75,50), (100,50), (125,50),
+    // and mouseup at (150,50)
+    assertJsonEquals(
+      "[" +
+      "{type: \"mousemove\", x: 50, y: 50}," +
+      "{type: \"mousedown\", x: 50, y: 50}," +
+      "{type: \"mousemove\", x: 75, y: 75}," +
+      "{type: \"mousemove\", x: 100, y: 100}," +
+      "{type: \"mousemove\", x: 125, y: 125}," +
+      "{type: \"mousemove\", x: 150, y: 150}," +
+      "{type: \"mouseup\", x: 150, y: 150}" +
+      "]",
+      json
+    );
+  }
+
+  @Test
+  void shouldDragToWithTweenedMouseMovement() {
+    page.setContent(
+      "<body style='margin: 0; padding: 0;'>\n" +
+      "  <div style='width:100px;height:100px;background:red;' id='red'></div>\n" +
+      "  <div style='width:300px;height:100px;background:blue;' id='blue'></div>\n" +
+      "</body>"
+    );
+
+    JSHandle eventsHandle = page.evaluateHandle("() => {\n" +
+      "  const events = [];\n" +
+      "  document.addEventListener('mousedown', event => {\n" +
+      "    events.push({ type: 'mousedown', x: event.pageX, y: event.pageY });\n" +
+      "  });\n" +
+      "  document.addEventListener('mouseup', event => {\n" +
+      "    events.push({ type: 'mouseup', x: event.pageX, y: event.pageY });\n" +
+      "  });\n" +
+      "  document.addEventListener('mousemove', event => {\n" +
+      "    events.push({ type: 'mousemove', x: event.pageX, y: event.pageY });\n" +
+      "  });\n" +
+      "  return events;\n" +
+      "}");
+
+    // Red div center is at (50, 50), blue div center is at (150, 50)
+    // With 4 steps, we expect intermediate positions at (75, 50), (100, 50), (125, 50)
+    page.locator("#red").dragTo(page.locator("#blue"), new Locator.DragToOptions().setSteps(4));
+
+    Object json = eventsHandle.jsonValue();
+    // Expected sequence: mousemove to (50,50), mousedown at (50,50),
+    // then 3 mousemove events at (75,50), (100,50), (125,50),
+    // and mouseup at (150,50)
+    assertJsonEquals(
+      "[" +
+        "{type: \"mousemove\", x: 50, y: 50}," +
+        "{type: \"mousedown\", x: 50, y: 50}," +
+        "{type: \"mousemove\", x: 75, y: 75}," +
+        "{type: \"mousemove\", x: 100, y: 100}," +
+        "{type: \"mousemove\", x: 125, y: 125}," +
+        "{type: \"mousemove\", x: 150, y: 150}," +
+        "{type: \"mouseup\", x: 150, y: 150}" +
+        "]",
+      json
+    );
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageDrop.java b/playwright/src/test/java/com/microsoft/playwright/TestPageDrop.java
new file mode 100644
index 000000000..bfa92700c
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageDrop.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.FilePayload;
+import com.microsoft.playwright.options.DropPayload;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.microsoft.playwright.Utils.mapOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestPageDrop extends TestBase {
+  private void setupDropzone() {
+    page.setContent("<style>#dropzone { width: 300px; height: 200px; border: 2px dashed #888; }</style>\n" +
+      "<div id=\"dropzone\"></div>\n" +
+      "<script>\n" +
+      "  window.__dropInfo = null;\n" +
+      "  const zone = document.getElementById('dropzone');\n" +
+      "  zone.addEventListener('dragenter', e => e.preventDefault());\n" +
+      "  zone.addEventListener('dragover', e => e.preventDefault());\n" +
+      "  zone.addEventListener('drop', async e => {\n" +
+      "    e.preventDefault();\n" +
+      "    const files = [];\n" +
+      "    for (const file of e.dataTransfer.files)\n" +
+      "      files.push({ name: file.name, type: file.type, size: file.size, text: await file.text() });\n" +
+      "    const data = {};\n" +
+      "    for (const t of e.dataTransfer.types) {\n" +
+      "      if (t !== 'Files')\n" +
+      "        data[t] = e.dataTransfer.getData(t);\n" +
+      "    }\n" +
+      "    window.__dropInfo = { files, data };\n" +
+      "  });\n" +
+      "</script>");
+  }
+
+  @SuppressWarnings("unchecked")
+  private Map<String, Object> waitForDropInfo() {
+    page.waitForCondition(() -> page.evaluate("window.__dropInfo") != null);
+    return (Map<String, Object>) page.evaluate("window.__dropInfo");
+  }
+
+  @Test
+  void shouldDropFilePayload() {
+    setupDropzone();
+    page.locator("#dropzone").drop(new DropPayload().setFiles(new FilePayload("note.txt", "text/plain", "hello".getBytes(StandardCharsets.UTF_8))));
+    Map<String, Object> info = waitForDropInfo();
+    @SuppressWarnings("unchecked")
+    List<Map<String, Object>> files = (List<Map<String, Object>>) info.get("files");
+    assertEquals(1, files.size());
+    assertEquals("note.txt", files.get(0).get("name"));
+    assertEquals("text/plain", files.get(0).get("type"));
+    assertEquals("hello", files.get(0).get("text"));
+  }
+
+  @Test
+  void shouldDropMultipleFilePayloads() {
+    setupDropzone();
+    page.locator("#dropzone").drop(new DropPayload().setFiles(new FilePayload[] {
+      new FilePayload("a.txt", "text/plain", "AAA".getBytes(StandardCharsets.UTF_8)),
+      new FilePayload("b.txt", "text/plain", "BB".getBytes(StandardCharsets.UTF_8)),
+    }));
+    Map<String, Object> info = waitForDropInfo();
+    @SuppressWarnings("unchecked")
+    List<Map<String, Object>> files = (List<Map<String, Object>>) info.get("files");
+    assertEquals(2, files.size());
+    assertEquals("a.txt", files.get(0).get("name"));
+    assertEquals("AAA", files.get(0).get("text"));
+    assertEquals("b.txt", files.get(1).get("name"));
+    assertEquals("BB", files.get(1).get("text"));
+  }
+
+  @Test
+  void shouldDropClipboardLikeData() {
+    setupDropzone();
+    Map<String, String> data = new HashMap<>();
+    data.put("text/plain", "hello world");
+    data.put("text/uri-list", "https://example.com");
+    page.locator("#dropzone").drop(new DropPayload().setData(data));
+    Map<String, Object> info = waitForDropInfo();
+    @SuppressWarnings("unchecked")
+    List<?> files = (List<?>) info.get("files");
+    assertTrue(files.isEmpty(), "expected no files");
+    @SuppressWarnings("unchecked")
+    Map<String, String> droppedData = (Map<String, String>) info.get("data");
+    assertEquals("hello world", droppedData.get("text/plain"));
+    assertEquals("https://example.com", droppedData.get("text/uri-list"));
+  }
+
+  @Test
+  void shouldDropFileByLocalPath(@org.junit.jupiter.api.io.TempDir Path dir) throws Exception {
+    setupDropzone();
+    Path filePath = dir.resolve("hello.txt");
+    Files.write(filePath, "path-content".getBytes(StandardCharsets.UTF_8));
+    page.locator("#dropzone").drop(new DropPayload().setFiles(filePath));
+    Map<String, Object> info = waitForDropInfo();
+    @SuppressWarnings("unchecked")
+    List<Map<String, Object>> files = (List<Map<String, Object>>) info.get("files");
+    assertEquals(1, files.size());
+    assertEquals("hello.txt", files.get(0).get("name"));
+    assertEquals("path-content", files.get(0).get("text"));
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java
index f3c5b6766..8b4b0b2fc 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.ConsoleMessagesFilter;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
@@ -26,8 +27,7 @@
 import static com.microsoft.playwright.Utils.mapOf;
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestPageEventConsole extends TestBase {
   @Test
@@ -149,4 +149,60 @@ void consoleMessagesShouldWork() {
       assertEquals(page, message.page());
     }
   }
+
+  @Test
+  void shouldHaveTimestamp() {
+    double before = (double) System.currentTimeMillis() - 1;
+    ConsoleMessage message = page.waitForConsoleMessage(
+      () -> page.evaluate("() => console.log('timestamp test')"));
+    double after = (double) System.currentTimeMillis() + 1;
+    assertTrue(message.timestamp() >= before,
+      "timestamp " + message.timestamp() + " should be >= " + before);
+    assertTrue(message.timestamp() <= after,
+      "timestamp " + message.timestamp() + " should be <= " + after);
+  }
+
+  @Test
+  void shouldHaveIncreasingTimestamps() {
+    List<ConsoleMessage> messages = new ArrayList<>();
+    page.onConsoleMessage(messages::add);
+    page.evaluate("() => { console.log('first'); console.log('second'); console.log('third'); }");
+    assertEquals(3, messages.size());
+    for (int i = 1; i < messages.size(); i++)
+      assertTrue(messages.get(i).timestamp() >= messages.get(i - 1).timestamp());
+  }
+
+  @Test
+  void clearConsoleMessagesShouldWork() {
+    page.evaluate("() => { console.log('message1'); console.log('message2'); }");
+    List<ConsoleMessage> messages = page.consoleMessages();
+    assertTrue(messages.stream().anyMatch(m -> "message1".equals(m.text())));
+    assertTrue(messages.stream().anyMatch(m -> "message2".equals(m.text())));
+
+    page.clearConsoleMessages();
+    messages = page.consoleMessages();
+    assertEquals(0, messages.size());
+
+    page.waitForConsoleMessage(() -> page.evaluate("() => console.log('message3')"));
+    messages = page.consoleMessages();
+    assertEquals(1, messages.size());
+    assertEquals("message3", messages.get(0).text());
+  }
+
+  @Test
+  void consoleMessagesSinceNavigationFilterShouldWork() {
+    page.evaluate("() => console.log('before navigation')");
+    page.navigate(server.EMPTY_PAGE);
+    page.evaluate("() => console.log('after navigation')");
+
+    List<ConsoleMessage> all = page.consoleMessages(
+      new Page.ConsoleMessagesOptions().setFilter(ConsoleMessagesFilter.ALL));
+    assertTrue(all.stream().anyMatch(m -> "before navigation".equals(m.text())));
+    assertTrue(all.stream().anyMatch(m -> "after navigation".equals(m.text())));
+
+    // sinceNavigation is the default
+    List<ConsoleMessage> sinceNav = page.consoleMessages();
+    assertFalse(sinceNav.stream().anyMatch(m -> "before navigation".equals(m.text())));
+    assertTrue(sinceNav.stream().anyMatch(m -> "after navigation".equals(m.text())));
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
index a994102ef..f90f895f7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
@@ -18,7 +18,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,7 +30,7 @@ void pageErrorsShouldWork() {
     page.evaluate("async () => {\n" +
       "    for (let i = 0; i < 301; i++)\n" +
       "      window.setTimeout(() => { throw new Error('error' + i); }, 0);\n" +
-      "    await new Promise(f => window.setTimeout(f, 100));\n" +
+      "    await new Promise(f => window.setTimeout(f, 2000));\n" +
       "  }");
 
     List<String> errors = page.pageErrors();
@@ -44,4 +43,28 @@ void pageErrorsShouldWork() {
       assertTrue(error.startsWith("Error: error" + (201 + i)), error);
     }
   }
+
+  @Test
+  void clearPageErrorsShouldWork() {
+    page.navigate(server.EMPTY_PAGE);
+    page.evaluate("async () => {\n" +
+      "  window.setTimeout(() => { throw new Error('error1'); }, 0);\n" +
+      "  await new Promise(f => window.setTimeout(f, 100));\n" +
+      "}");
+
+    List<String> errors = page.pageErrors();
+    assertTrue(errors.stream().anyMatch(e -> e.contains("error1")));
+
+    page.clearPageErrors();
+    errors = page.pageErrors();
+    assertEquals(0, errors.size());
+
+    page.evaluate("async () => {\n" +
+      "  window.setTimeout(() => { throw new Error('error2'); }, 0);\n" +
+      "  await new Promise(f => window.setTimeout(f, 100));\n" +
+      "}");
+    errors = page.pageErrors();
+    assertEquals(1, errors.size());
+    assertTrue(errors.get(0).contains("error2"));
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java b/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
index 45fc926e6..40bd7cc63 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
@@ -164,35 +164,6 @@ void shouldWorkWithComplexObjects() {
     assertEquals( 7, ((Map) result).get("x"));
   }
 
-  @Test
-  void exposeBindingHandleShouldWork() {
-    JSHandle[] target = { null };
-    page.exposeBinding("logme", (source, args) -> {
-      target[0] = (JSHandle) args[0];
-      return 17;
-    }, new Page.ExposeBindingOptions().setHandle(true));
-    Object result = page.evaluate("async function() {\n" +
-      "  return window['logme']({ foo: 42 });\n" +
-      "}");
-    assertEquals(42, target[0].evaluate("x => x.foo"));
-    assertEquals(17, result);
-  }
-
-  @Test
-  void exposeBindingHandleShouldNotThrowDuringNavigation() {
-    page.exposeBinding("logme", (source, args) -> {
-      return 17;
-    }, new Page.ExposeBindingOptions().setHandle(true));
-    page.navigate(server.EMPTY_PAGE);
-
-    page.waitForNavigation(new Page.WaitForNavigationOptions().setWaitUntil(LOAD), () -> {
-      page.evaluate("async url => {\n" +
-        "  window['logme']({ foo: 42 });\n" +
-        "  window.location.href = url;\n" +
-        "}", server.PREFIX + "/one-style.html");
-    });
-  }
-
   @Test
   void shouldThrowForDuplicateRegistrations() {
     page.exposeFunction("foo", args -> null);
@@ -202,28 +173,6 @@ void shouldThrowForDuplicateRegistrations() {
     assertTrue(e.getMessage().contains("Function \"foo\" has been already registered"));
   }
 
-  @Test
-  void exposeBindingHandleShouldThrowForMultipleArguments() {
-    page.exposeBinding("logme", (source, args) -> {
-      return 17;
-    }, new Page.ExposeBindingOptions().setHandle(true));
-    assertEquals(17, page.evaluate("async function() {\n" +
-      "  return window['logme']({ foo: 42 });\n" +
-      "}"));
-    assertEquals(17, page.evaluate("async function() {\n" +
-      "  return window['logme']({ foo: 42 }, undefined, undefined);\n" +
-      "}"));
-    assertEquals(17, page.evaluate("async function() {\n" +
-      "  return window['logme'](undefined, undefined, undefined);\n" +
-      "}"));
-    PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
-      page.evaluate("async function() {\n" +
-        "  return window['logme'](1, 2);\n" +
-        "}");
-    });
-    assertTrue(e.getMessage().contains("exposeBindingHandle supports a single argument, 2 received"));
-  }
-
   @Test
   void shouldSerializeCycles() {
     Object[] object = { null };
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java b/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java
index e35f60526..b0d766c95 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java
@@ -161,6 +161,16 @@ void shouldWorkWithGlob() {
     assertFalse(globToRegex("http://localhost:3000/signin-oidc*").matcher("http://localhost:3000/signin-oidc/foo").find());
     assertTrue(globToRegex("http://localhost:3000/signin-oidc*").matcher("http://localhost:3000/signin-oidcnice").find());
 
+    assertTrue(globToRegex("**/*.js").matcher("/foo.js").find());
+    assertFalse(globToRegex("asd/**.js").matcher("/foo.js").find());
+    assertFalse(globToRegex("**/*.js").matcher("bar_foo.js").find());
+
+    // custom protocols
+    assertTrue(globToRegex("my.custom.protocol://**").matcher("my.custom.protocol://foo").find());
+    assertFalse(globToRegex("my.{p,y}://**").matcher("my.p://foo").find());
+    assertTrue(globToRegex("my.{p,y}://**").matcher("my.p://foo/").find());
+    assertTrue(globToRegex("f*e://**").matcher("file:///foo/").find());
+
     // range [] is NOT supported
     assertTrue(globToRegex("**/api/v[0-9]").matcher("http://example.com/api/v[0-9]").find());
     assertFalse(globToRegex("**/api/v[0-9]").matcher("http://example.com/api/version").find());
@@ -186,6 +196,10 @@ void shouldWorkWithGlob() {
     assertTrue(urlMatches("http://playwright.dev", "http://playwright.dev/?x=y", "?x=y"));
     assertTrue(urlMatches("http://playwright.dev/foo/", "http://playwright.dev/foo/bar?x=y", "./bar?x=y"));
 
+    // /**/ should match /.
+    assertTrue(urlMatches(null, "https://foo/bar.js", "https://foo/**/bar.js"));
+    assertTrue(urlMatches(null, "https://foo/bar.js", "https://foo/**/**/bar.js"));
+
     // Case insensitive matching
     assertTrue(urlMatches(null, "https://playwright.dev/fooBAR", "HtTpS://pLaYwRiGhT.dEv/fooBAR"));
     assertTrue(urlMatches("http://ignored", "https://playwright.dev/fooBAR", "HtTpS://pLaYwRiGhT.dEv/fooBAR"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java
index 7d6abfcdd..a102df53c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java
@@ -71,6 +71,35 @@ void shouldRejectResponseFinishedIfPageCloses() {
     assertTrue(e.getMessage().contains("closed"), e.getMessage());
   }
 
+  @Test
+  void shouldReturnNullExistingResponseBeforeResponseReceived() {
+    Request[] capturedRequest = {null};
+    page.route("**/*", route -> {
+      capturedRequest[0] = route.request();
+      assertNull(capturedRequest[0].existingResponse());
+      route.resume();
+    });
+    page.navigate(server.EMPTY_PAGE);
+    assertNotNull(capturedRequest[0]);
+  }
+
+  @Test
+  void shouldReturnExistingResponseAfterReceived() {
+    Response[] responses = {null};
+    page.onResponse(r -> responses[0] = r);
+    page.navigate(server.EMPTY_PAGE);
+    assertNotNull(responses[0]);
+    assertEquals(responses[0], responses[0].request().existingResponse());
+  }
+
+  @Test
+  void shouldReturnHttpVersion() {
+    page.navigate(server.EMPTY_PAGE);
+    Response response = page.waitForResponse("**/*", () -> page.navigate(server.EMPTY_PAGE));
+    String version = response.httpVersion();
+    assertTrue(version.matches("HTTP/[12](\\.[01])?"), "unexpected version: " + version);
+  }
+
   @Test
   void shouldRejectResponseFinishedIfContextCloses() {
     page.navigate(server.EMPTY_PAGE);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java b/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java
index d3485fc6f..9ba228b5e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java
@@ -20,9 +20,11 @@
 import com.microsoft.playwright.options.ScreenshotAnimations;
 import com.microsoft.playwright.options.ScreenshotCaret;
 import com.microsoft.playwright.options.ScreenshotScale;
+import com.microsoft.playwright.options.ScreenshotType;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.io.TempDir;
 import org.opentest4j.AssertionFailedError;
 
 import javax.imageio.ImageIO;
@@ -65,6 +67,39 @@ void shouldClipRect() throws IOException {
 //    expect(screenshot).toMatchSnapshot("screenshot-clip-rect.png");
   }
 
+  private static void assertWebp(byte[] screenshot) {
+    // WebP magic: "RIFF" at offset 0, "WEBP" at offset 8.
+    assertTrue(screenshot.length > 12);
+    assertEquals("RIFF", new String(screenshot, 0, 4, java.nio.charset.StandardCharsets.US_ASCII));
+    assertEquals("WEBP", new String(screenshot, 8, 4, java.nio.charset.StandardCharsets.US_ASCII));
+  }
+
+  @Test
+  void shouldProduceAValidWebpScreenshot() {
+    page.setViewportSize(300, 300);
+    page.navigate(server.EMPTY_PAGE);
+    byte[] screenshot = page.screenshot(new Page.ScreenshotOptions().setType(ScreenshotType.WEBP));
+    assertWebp(screenshot);
+  }
+
+  @Test
+  void pathOptionShouldDetectWebp(@TempDir Path tmpDir) throws IOException {
+    page.setViewportSize(300, 300);
+    page.navigate(server.EMPTY_PAGE);
+    Path outputPath = tmpDir.resolve("screenshot.webp");
+    byte[] screenshot = page.screenshot(new Page.ScreenshotOptions().setPath(outputPath));
+    assertWebp(screenshot);
+    assertWebp(Files.readAllBytes(outputPath));
+  }
+
+  @Test
+  void qualityOptionShouldWorkForWebp() {
+    page.navigate(server.PREFIX + "/grid.html");
+    byte[] lowQuality = page.screenshot(new Page.ScreenshotOptions().setType(ScreenshotType.WEBP).setQuality(0));
+    byte[] highQuality = page.screenshot(new Page.ScreenshotOptions().setType(ScreenshotType.WEBP).setQuality(100));
+    assertTrue(lowQuality.length < highQuality.length);
+  }
+
   static private void rafraf(Page page) {
     // Do a double raf since single raf does not
     // actually guarantee a new animation frame.
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPopup.java b/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
index c8bd17d00..5e0f36715 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
@@ -17,6 +17,7 @@
 package com.microsoft.playwright;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assumptions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -107,6 +108,8 @@ void shouldInheritHttpCredentialsFromBrowserContext() {
 
   @Test
   void shouldInheritTouchSupportFromBrowserContext() {
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=2014330
+    Assumptions.assumeFalse(isFirefox() && Integer.parseInt(browser.version().split("\\.")[0]) >= 148);
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(400, 500)
       .setHasTouch(true));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java b/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java
index 9be72a8e6..9f3ff45b9 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java
@@ -40,18 +40,18 @@ void resetWebSocketServer() {
     webSocketServer.reset();
   }
 
-  private void setupWS(Page target, int port, String binaryType) {
-    setupWS(target.mainFrame(), port, binaryType);
+  private void setupWS(Page target, Server server, int port, String binaryType) {
+    setupWS(target.mainFrame(), server, port, binaryType);
   }
-  private void setupWS(Frame target, int port, String binaryType) {
-    target.navigate("about:blank");
+  private void setupWS(Frame target, Server server, int port, String binaryType) {
+    target.navigate(server.EMPTY_PAGE);
+    // No 'error' listener: WebKit fires a spurious 'error' before 'close' on non-normal closures (e.g. 1008).
     target.evaluate("({ port, binaryType }) => {\n" +
       "    window.log = [];\n" +
       "    window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
       "    window.ws.binaryType = binaryType;\n" +
       "    window.ws.addEventListener('open', () => window.log.push('open'));\n" +
       "    window.ws.addEventListener('close', event => window.log.push(`close code=${event.code} reason=${event.reason}`));\n" +
-      "    window.ws.addEventListener('error', event => window.log.push(`error`));\n" +
       "    window.ws.addEventListener('message', async event => {\n" +
       "      let data;\n" +
       "      if (typeof event.data === 'string')\n" +
@@ -92,10 +92,10 @@ private void setupRoute(Page page, String mock) {
 
   @ParameterizedTest
   @ValueSource(strings = {"no-mock", "no-match", "pass-through"})
-  public void shouldWorkWithTextMessage(String mock, Page page) throws Exception {
+  public void shouldWorkWithTextMessage(String mock, Page page, Server server) throws Exception {
     setupRoute(page, mock);
     Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
-    setupWS(page, webSocketServer.getPort(), "blob");
+    setupWS(page, server, webSocketServer.getPort(), "blob");
 
     page.waitForCondition(() -> {
       Boolean result = (Boolean) page.evaluate("() => window.log.length >= 1");
@@ -134,10 +134,10 @@ public void shouldWorkWithTextMessage(String mock, Page page) throws Exception {
 
   @ParameterizedTest
   @ValueSource(strings = {"no-mock", "no-match", "pass-through"})
-  public void shouldWorkWithBinaryTypeBlob(String mock, Page page) throws Exception {
+  public void shouldWorkWithBinaryTypeBlob(String mock, Page page, Server server) throws Exception {
     setupRoute(page, mock);
     Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
-    setupWS(page, webSocketServer.getPort(), "blob");
+    setupWS(page, server, webSocketServer.getPort(), "blob");
     org.java_websocket.WebSocket ws = wsPromise.get();
     ws.send("hi".getBytes(StandardCharsets.UTF_8));
     page.waitForCondition(() -> {
@@ -157,10 +157,10 @@ public void shouldWorkWithBinaryTypeBlob(String mock, Page page) throws Exceptio
 
   @ParameterizedTest
   @ValueSource(strings = {"no-mock", "no-match", "pass-through"})
-  public void shouldWorkWithBinaryTypeArrayBuffer(String mock, Page page) throws Exception {
+  public void shouldWorkWithBinaryTypeArrayBuffer(String mock, Page page, Server server) throws Exception {
     setupRoute(page, mock);
     Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
-    setupWS(page, webSocketServer.getPort(), "arraybuffer");
+    setupWS(page, server, webSocketServer.getPort(), "arraybuffer");
     org.java_websocket.WebSocket ws = wsPromise.get();
     ws.send("hi".getBytes(StandardCharsets.UTF_8));
     page.waitForCondition(() -> {
@@ -179,10 +179,10 @@ public void shouldWorkWithBinaryTypeArrayBuffer(String mock, Page page) throws E
   }
 
   @Test
-  public void shouldWorkWithServer(Page page) throws ExecutionException, InterruptedException {
+  public void shouldWorkWithServer(Page page, Server server) throws ExecutionException, InterruptedException {
     WebSocketRoute[] wsRoute = new WebSocketRoute[]{null};
     page.routeWebSocket(Pattern.compile("/.*/"), ws -> {
-      WebSocketRoute server = ws.connectToServer();
+      WebSocketRoute serverRoute = ws.connectToServer();
       ws.onMessage(frame -> {
         String message = frame.text();
         switch (message) {
@@ -192,13 +192,13 @@ public void shouldWorkWithServer(Page page) throws ExecutionException, Interrupt
           case "to-block":
             break;
           case "to-modify":
-            server.send("modified");
+            serverRoute.send("modified");
             break;
           default:
-            server.send(message);
+            serverRoute.send(message);
         }
       });
-      server.onMessage(frame -> {
+      serverRoute.onMessage(frame -> {
         String message = frame.text();
         switch (message) {
           case "to-block":
@@ -210,12 +210,12 @@ public void shouldWorkWithServer(Page page) throws ExecutionException, Interrupt
             ws.send(message);
         }
       });
-      server.send("fake");
+      serverRoute.send("fake");
       wsRoute[0] = ws;
     });
 
     Future<WebSocket> ws = webSocketServer.waitForWebSocket();
-    setupWS(page, webSocketServer.getPort(), "blob");
+    setupWS(page, server, webSocketServer.getPort(), "blob");
     page.waitForCondition(() -> webSocketServer.logCopy().size() >= 1);
     assertEquals(
       asList("message: fake"),
@@ -277,7 +277,7 @@ public void shouldWorkWithServer(Page page) throws ExecutionException, Interrupt
   }
 
   @Test
-  public void shouldWorkWithoutServer(Page page) {
+  public void shouldWorkWithoutServer(Page page, Server server) {
     WebSocketRoute[] wsRoute = new WebSocketRoute[]{ null };
     page.routeWebSocket(Pattern.compile("/.*/"), ws -> {
       ws.onMessage(frame -> {
@@ -288,7 +288,7 @@ public void shouldWorkWithoutServer(Page page) {
       });
       wsRoute[0] = ws;
     });
-    setupWS(page, webSocketServer.getPort(), "blob");
+    setupWS(page, server, webSocketServer.getPort(), "blob");
 
     page.evaluate("async () => {\n" +
       "    await window.wsOpened;\n" +
@@ -321,7 +321,7 @@ public void shouldWorkWithoutServer(Page page) {
   }
 
   @Test
-  public void shouldWorkWithBaseURL(Browser browser) throws Exception {
+  public void shouldWorkWithBaseURL(Browser browser, Server server) throws Exception {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setBaseURL("http://localhost:" + webSocketServer.getPort()));
     Page newPage = context.newPage();
 
@@ -335,7 +335,7 @@ public void shouldWorkWithBaseURL(Browser browser) throws Exception {
       });
     });
 
-    setupWS(newPage, webSocketServer.getPort(), "blob");
+    setupWS(newPage, server, webSocketServer.getPort(), "blob");
 
     newPage.evaluate("async () => {\n" +
       "    await window.wsOpened;\n" +
@@ -353,7 +353,7 @@ public void shouldWorkWithBaseURL(Browser browser) throws Exception {
   }
 
   @Test
-  public void shouldWorkWithNoTrailingSlash(Page page) throws Exception {  
+  public void shouldWorkWithNoTrailingSlash(Page page) throws Exception {
     List<String> log = new ArrayList<>();
 
     // No trailing slash in the route pattern
@@ -384,11 +384,36 @@ public void shouldWorkWithNoTrailingSlash(Page page) throws Exception {
     page.waitForCondition(() -> log.size() >= 1);
     assertEquals(asList("query"), log);
 
-    // Wait and verify client received response 
+    // Wait and verify client received response
     page.waitForCondition(() -> {
       Boolean result = (Boolean) page.evaluate("() => window.log.length >= 1");
       return result;
     });
     assertEquals(asList("response"), page.evaluate("window.log"));
   }
+
+  @Test
+  public void shouldExposeProtocolsToTheRouteHandler(Page page, Server server) {
+    List<com.microsoft.playwright.WebSocketRoute> routes = new ArrayList<>();
+    page.routeWebSocket(Pattern.compile(".*"), ws -> routes.add(ws));
+
+    page.navigate(server.EMPTY_PAGE);
+    int port = webSocketServer.getPort();
+    page.evaluate("({ port }) => {\n" +
+      "  window.wsNone = new WebSocket('ws://localhost:' + port + '/ws-none');\n" +
+      "  window.wsString = new WebSocket('ws://localhost:' + port + '/ws-string', 'chat.v1');\n" +
+      "  window.wsArray = new WebSocket('ws://localhost:' + port + '/ws-array', ['chat.v2', 'chat.v1']);\n" +
+      "}", mapOf("port", port));
+
+    page.waitForCondition(() -> routes.size() == 3);
+
+    java.util.Map<String, com.microsoft.playwright.WebSocketRoute> byUrl = new java.util.HashMap<>();
+    for (com.microsoft.playwright.WebSocketRoute r : routes) {
+      String path = java.net.URI.create(r.url()).getPath();
+      byUrl.put(path, r);
+    }
+    assertEquals(asList(), byUrl.get("/ws-none").protocols());
+    assertEquals(asList("chat.v1"), byUrl.get("/ws-string").protocols());
+    assertEquals(asList("chat.v2", "chat.v1"), byUrl.get("/ws-array").protocols());
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java b/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java
index 7f816eade..f36d1b977 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java
@@ -16,12 +16,14 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.AnnotatePosition;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -58,38 +60,6 @@ void shouldSaveAsVideo(@TempDir Path videosDir) {
     assertTrue(Files.exists(saveAsPath));
   }
 
-  @Test
-  void saveAsShouldThrowWhenNoVideoFrames(@TempDir Path videosDir) {
-    try (BrowserContext context = browser.newContext(
-      new Browser.NewContextOptions()
-        .setRecordVideoDir(videosDir)
-        .setRecordVideoSize(320, 240)
-        .setViewportSize(320, 240))) {
-
-      Page page = context.newPage();
-      Page popup = context.waitForPage(() -> {
-        page.evaluate("() => {\n" +
-          "  const win = window.open('about:blank');\n" +
-          "  win.close();\n" +
-          "}");
-      });
-      page.close();
-
-      Path saveAsPath = videosDir.resolve("my-video.webm");
-      if (!popup.isClosed()) {
-        popup.waitForClose(() -> {});
-      }
-      // WebKit pauses renderer before win.close() and actually writes something.
-      if (isWebKit()) {
-        popup.video().saveAs(saveAsPath);
-        assertTrue(Files.exists(saveAsPath));
-      } else {
-        PlaywrightException e = assertThrows(PlaywrightException.class, () -> popup.video().saveAs(saveAsPath));
-        assertTrue(e.getMessage().contains("Page did not produce any video frames"), e.getMessage());
-      }
-    }
-  }
-
   @Test
   void shouldDeleteVideo(@TempDir Path videosDir) {
     try (BrowserContext context = browser.newContext(
@@ -130,15 +100,169 @@ void shouldWaitForVideoFinishWhenPageIsClosed(@TempDir Path videosDir) throws IO
   }
 
   @Test
-  void shouldErrorIfPageNotClosedBeforeSaveAs(@TempDir Path tmpDir) {
-    try (Page page = browser.newPage(new Browser.NewPageOptions().setRecordVideoDir(tmpDir))) {
-      page.navigate(server.PREFIX + "/grid.html");
-      Path outPath = tmpDir.resolve("some-video.webm");
-      Video video = page.video();
-      PlaywrightException exception = assertThrows(PlaywrightException.class, () -> video.saveAs(outPath));
-      assertTrue(
-        exception.getMessage().contains("Page is not yet closed. Close the page prior to calling saveAs"),
-        exception.getMessage());
+  void screencastStartShouldDeliverFramesViaOnFrame() throws Exception {
+    BrowserContext context = browser.newContext(new Browser.NewContextOptions().setViewportSize(500, 400));
+    Page page = context.newPage();
+    try {
+      List<ScreencastFrame> frames = new ArrayList<>();
+      page.screencast().start(new Screencast.StartOptions().setOnFrame(frames::add));
+      page.navigate(server.EMPTY_PAGE);
+      page.evaluate("() => document.body.style.backgroundColor = 'red'");
+      page.waitForTimeout(500);
+      page.screencast().stop();
+      assertFalse(frames.isEmpty(), "expected at least one frame");
+      // JPEG-encoded frames start with FF D8.
+      for (ScreencastFrame frame : frames) {
+        assertNotNull(frame.data());
+        assertEquals((byte) 0xFF, frame.data()[0]);
+        assertEquals((byte) 0xD8, frame.data()[1]);
+      }
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void onFrameShouldReceiveViewportSizeAndTimestamp() {
+    BrowserContext context = browser.newContext(new Browser.NewContextOptions().setViewportSize(1000, 400));
+    Page page = context.newPage();
+    try {
+      List<ScreencastFrame> frames = new ArrayList<>();
+      page.screencast().start(new Screencast.StartOptions().setOnFrame(frames::add).setSize(500, 400));
+      page.navigate(server.EMPTY_PAGE);
+      page.evaluate("() => document.body.style.backgroundColor = 'red'");
+      page.waitForTimeout(500);
+      page.screencast().stop();
+      assertFalse(frames.isEmpty(), "expected at least one frame");
+      for (ScreencastFrame frame : frames) {
+        assertEquals(1000, frame.viewportWidth());
+        assertEquals(400, frame.viewportHeight());
+        assertTrue(frame.timestamp() > 0, "expected a positive timestamp, got " + frame.timestamp());
+      }
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastStartShouldThrowIfAlreadyStarted() {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    try {
+      page.screencast().start(new Screencast.StartOptions().setOnFrame(data -> {}));
+      PlaywrightException e = assertThrows(PlaywrightException.class,
+        () -> page.screencast().start(new Screencast.StartOptions().setOnFrame(data -> {})));
+      assertTrue(e.getMessage().contains("Screencast is already started"), e.getMessage());
+      page.screencast().stop();
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastStartShouldRecordVideoToPath(@TempDir Path tmpDir) throws Exception {
+    Path videoPath = tmpDir.resolve("video.webm");
+    BrowserContext context = browser.newContext(new Browser.NewContextOptions().setViewportSize(800, 600));
+    Page page = context.newPage();
+    try {
+      page.screencast().start(new Screencast.StartOptions().setPath(videoPath));
+      page.navigate(server.EMPTY_PAGE);
+      page.evaluate("() => document.body.style.backgroundColor = 'red'");
+      page.waitForTimeout(500);
+      page.screencast().stop();
+      assertTrue(Files.exists(videoPath), "video file should exist: " + videoPath);
+      assertTrue(Files.size(videoPath) > 0);
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastStartReturnsDisposable() throws Exception {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    try {
+      AutoCloseable disposable = page.screencast().start(new Screencast.StartOptions().setOnFrame(data -> {}));
+      disposable.close();
+      // After dispose, starting again should succeed.
+      page.screencast().start(new Screencast.StartOptions().setOnFrame(data -> {}));
+      page.screencast().stop();
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastShowOverlay() throws Exception {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      AutoCloseable disposable = page.screencast().showOverlay("<div>Hello Overlay</div>");
+      assertNotNull(disposable);
+      disposable.close();
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastShowChapter() {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      page.screencast().showChapter("Chapter Title");
+      page.screencast().showChapter("With Description",
+        new Screencast.ShowChapterOptions().setDescription("Some details").setDuration(100));
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastHideShowOverlays() {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      page.screencast().showOverlay("<div>visible</div>");
+      page.screencast().hideOverlays();
+      page.screencast().showOverlays();
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastShowAndHideActions() throws Exception {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      AutoCloseable disposable = page.screencast().showActions();
+      assertNotNull(disposable);
+      disposable.close();
+      page.screencast().hideActions();
+    } finally {
+      context.close();
+    }
+  }
+
+  @Test
+  void screencastShowActionsShouldAcceptEveryPosition() throws Exception {
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      for (AnnotatePosition position : AnnotatePosition.values()) {
+        AutoCloseable disposable = page.screencast().showActions(
+          new Screencast.ShowActionsOptions().setPosition(position));
+        assertNotNull(disposable);
+        disposable.close();
+      }
+    } finally {
+      context.close();
     }
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java
index b1442d23a..6d553c4db 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -24,6 +25,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+@Tag("smoke")
 public class TestSelectorsCss extends TestBase {
 
   @Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java
index a04ace027..da1f729cf 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java
@@ -51,6 +51,20 @@ void getByTestIdWithCustomTestIdShouldWork() {
     assertThat(page.locator("div").getByTestId("Hello")).hasText("Hello world");
   }
 
+  @Test
+  void getByTestIdWithCommaSeparatedTestIdAttributesShouldMatchAny() {
+    page.setContent("<section>\n" +
+      "  <div data-pw='Hello'>first</div>\n" +
+      "  <div data-ti='Hello'>second</div>\n" +
+      "  <div data-testid='Hello'>third</div>\n" +
+      "</section>");
+    playwright.selectors().setTestIdAttribute("data-pw,data-ti");
+    assertThat(page.getByTestId("Hello")).hasCount(2);
+    assertThat(page.getByTestId("Hello")).hasText(new String[]{"first", "second"});
+    assertThat(page.mainFrame().getByTestId("Hello")).hasCount(2);
+    assertThat(page.locator("section").getByTestId("Hello")).hasCount(2);
+  }
+
   @Test
   void shouldUseDataTestidInStrictErrors() {
     playwright.selectors().setTestIdAttribute("data-custom-id");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java
index 24f109948..827c06ae4 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java
@@ -448,7 +448,7 @@ void errors() {
     assertTrue(e0.getMessage().contains("Role must not be empty"), e0.getMessage());
 
     PlaywrightException e1 = assertThrows(PlaywrightException.class, () -> page.querySelector("role=foo[sElected]"));
-    assertTrue(e1.getMessage().contains("Unknown attribute \"sElected\", must be one of \"checked\", \"disabled\", \"expanded\", \"include-hidden\", \"level\", \"name\", \"pressed\", \"selected\""), e1.getMessage());
+    assertTrue(e1.getMessage().contains("Unknown attribute \"sElected\", must be one of \"checked\", \"description\", \"disabled\", \"expanded\", \"include-hidden\", \"level\", \"name\", \"pressed\", \"selected\""), e1.getMessage());
 
     PlaywrightException e2 = assertThrows(PlaywrightException.class, () -> page.querySelector("role=foo[bar . qux=true]"));
     assertTrue(e2.getMessage().contains("Unknown attribute \"bar.qux\""), e2.getMessage());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestTracing.java b/playwright/src/test/java/com/microsoft/playwright/TestTracing.java
index 69008ab9e..0dd42048a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestTracing.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestTracing.java
@@ -158,6 +158,7 @@ void shouldCollectSources(@TempDir Path tmpDir) throws Exception {
         Pattern.compile("Set content"),
         Pattern.compile("Click")
       });
+      traceViewer.selectAction("Click");
       traceViewer.showSourceTab();
       assertThat(traceViewer.stackFrames()).containsText(new Pattern[] {
         Pattern.compile("myMethodInner"),
@@ -379,4 +380,15 @@ public void shouldShowWaitForLoadState(@TempDir Path tempDir) throws Exception {
       });
     });
   }
+
+  @Test
+  public void shouldRecordHarWithStartHarStopHar(@TempDir Path tempDir) throws Exception {
+    Path harPath = tempDir.resolve("tracing.har");
+    context.tracing().startHar(harPath, new Tracing.StartHarOptions().setMode(com.microsoft.playwright.options.HarMode.MINIMAL));
+    page.navigate(server.PREFIX + "/one-style.html");
+    context.tracing().stopHar();
+    String content = new String(Files.readAllBytes(harPath));
+    assertTrue(content.contains("\"log\""), content);
+    assertTrue(content.contains("/one-style.html"), content);
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestVideo.java b/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
index 6d6606590..c2b6ee564 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
@@ -23,7 +23,7 @@
 import java.nio.file.Path;
 
 import static com.microsoft.playwright.Utils.relativePathOrSkipTest;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestVideo extends TestBase {
   @Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWebStorage.java b/playwright/src/test/java/com/microsoft/playwright/TestWebStorage.java
new file mode 100644
index 000000000..98d1c6e17
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWebStorage.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.WebStorageItem;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.microsoft.playwright.Utils.mapOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestWebStorage extends TestBase {
+  private static Map<String, String> asMap(List<WebStorageItem> items) {
+    Map<String, String> map = new HashMap<>();
+    for (WebStorageItem item : items) {
+      map.put(item.name, item.value);
+    }
+    return map;
+  }
+
+  @Test
+  void localStorageItemsReturnsEmptyListOnFreshOrigin() {
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(0, page.localStorage().items().size());
+  }
+
+  @Test
+  void localStorageGetItemReturnsNullForMissingKey() {
+    page.navigate(server.EMPTY_PAGE);
+    assertNull(page.localStorage().getItem("absent"));
+  }
+
+  @Test
+  void localStorageSetItemPersistsAndSurfacesInItemsAndGetItem() {
+    page.navigate(server.EMPTY_PAGE);
+    page.localStorage().setItem("alpha", "1");
+    page.localStorage().setItem("beta", "2");
+
+    assertEquals(mapOf("alpha", "1", "beta", "2"), asMap(page.localStorage().items()));
+    assertEquals("1", page.localStorage().getItem("alpha"));
+    assertEquals("1", page.evaluate("() => localStorage.getItem('alpha')"));
+  }
+
+  @Test
+  void localStorageSetItemOverwritesExistingValue() {
+    page.navigate(server.EMPTY_PAGE);
+    page.localStorage().setItem("k", "first");
+    page.localStorage().setItem("k", "second");
+    assertEquals("second", page.localStorage().getItem("k"));
+  }
+
+  @Test
+  void localStorageRemoveItemRemovesSingleItem() {
+    page.navigate(server.EMPTY_PAGE);
+    page.localStorage().setItem("a", "1");
+    page.localStorage().setItem("b", "2");
+
+    page.localStorage().removeItem("a");
+    assertEquals(mapOf("b", "2"), asMap(page.localStorage().items()));
+  }
+
+  @Test
+  void localStorageClearEmptiesStorage() {
+    page.navigate(server.EMPTY_PAGE);
+    page.localStorage().setItem("a", "1");
+    page.localStorage().setItem("b", "2");
+
+    page.localStorage().clear();
+    assertEquals(0, page.localStorage().items().size());
+  }
+
+  @Test
+  void sessionStorageRoundTrip() {
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(0, page.sessionStorage().items().size());
+
+    page.sessionStorage().setItem("s1", "v1");
+    page.sessionStorage().setItem("s2", "v2");
+    assertEquals(mapOf("s1", "v1", "s2", "v2"), asMap(page.sessionStorage().items()));
+    assertEquals("v1", page.sessionStorage().getItem("s1"));
+
+    page.sessionStorage().removeItem("s1");
+    assertEquals(mapOf("s2", "v2"), asMap(page.sessionStorage().items()));
+
+    page.sessionStorage().clear();
+    assertEquals(0, page.sessionStorage().items().size());
+  }
+
+  @Test
+  void localStorageAndSessionStorageAreIndependent() {
+    page.navigate(server.EMPTY_PAGE);
+    page.localStorage().setItem("shared", "local");
+    page.sessionStorage().setItem("shared", "session");
+
+    assertEquals("local", page.localStorage().getItem("shared"));
+    assertEquals("session", page.sessionStorage().getItem("shared"));
+
+    page.localStorage().clear();
+    assertEquals(0, page.localStorage().items().size());
+    assertEquals("session", page.sessionStorage().getItem("shared"));
+  }
+
+  @Test
+  void storageMethodsAreScopedToTheCurrentOrigin() {
+    page.navigate(server.PREFIX + "/empty.html");
+    page.localStorage().setItem("k", "origin-1");
+
+    page.navigate(server.CROSS_PROCESS_PREFIX + "/empty.html");
+    assertEquals(0, page.localStorage().items().size());
+    page.localStorage().setItem("k", "origin-2");
+
+    page.navigate(server.PREFIX + "/empty.html");
+    assertEquals("origin-1", page.localStorage().getItem("k"));
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java b/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java
index 9cb3b98f5..379b7d116 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java
@@ -196,5 +196,26 @@ void shouldFormatNumberUsingContextLocale() {
     assertEquals("10\u00A0000,2", worker.evaluate("() => (10000.20).toLocaleString()"));
     context.close();
   }
+
+  @Test
+  void shouldReportConsoleEventOnTheWorker() {
+    Worker worker = page.waitForWorker(() -> page.evaluate(
+      "() => { window.worker = new Worker(URL.createObjectURL(new Blob(['42'], {type: 'application/javascript'}))); }"
+    ));
+
+    ConsoleMessage[] message2 = {null};
+    ConsoleMessage[] message3 = {null};
+
+    page.onConsoleMessage(msg -> message2[0] = msg);
+    page.context().onConsoleMessage(msg -> message3[0] = msg);
+
+    ConsoleMessage message1 = worker.waitForConsoleMessage(() -> {
+      worker.evaluate("() => console.log('hello from worker')");
+    });
+
+    assertEquals("hello from worker", message1.text());
+    assertSame(message1, message2[0]);
+    assertSame(message1, message3[0]);
+  }
 }
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java b/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java
index b64079386..21a94d64f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java
@@ -43,7 +43,7 @@ Locator actionTitles() {
   }
 
   Locator stackFrames() {
-    return this.page.getByRole(AriaRole.LIST, new Page.GetByRoleOptions().setName("stack trace")).getByRole(AriaRole.LISTITEM);
+    return this.page.getByRole(AriaRole.LISTBOX, new Page.GetByRoleOptions().setName("stack trace")).getByRole(AriaRole.OPTION);
   }
 
   void selectAction(String title, int ordinal) {
diff --git a/playwright/src/test/java/com/microsoft/playwright/Utils.java b/playwright/src/test/java/com/microsoft/playwright/Utils.java
index ad9f7d107..6ab8933a6 100644
--- a/playwright/src/test/java/com/microsoft/playwright/Utils.java
+++ b/playwright/src/test/java/com/microsoft/playwright/Utils.java
@@ -37,24 +37,12 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Utils {
-  private static final AtomicInteger nextUnusedPort = new AtomicInteger(9000);
-
-  private static boolean available(int port) {
-    try (ServerSocket ignored = new ServerSocket(port)) {
-      return true;
-    } catch (IOException ignored) {
-      return false;
-    }
-  }
-
   public static int nextFreePort() {
-    for (int i = 0; i < 100; i++) {
-      int port = nextUnusedPort.getAndIncrement();
-      if (available(port)) {
-        return port;
-      }
+    try (ServerSocket socket = new ServerSocket(0)) {
+      return socket.getLocalPort();
+    } catch (IOException e) {
+      throw new RuntimeException("Cannot find free port", e);
     }
-    throw new RuntimeException("Cannot find free port: " + nextUnusedPort.get());
   }
 
   static void assertJsonEquals(Object expected, Object actual) {
diff --git a/driver-bundle/src/test/java/com/microsoft/playwright/impl/driver/jar/TestInstall.java b/playwright/src/test/java/com/microsoft/playwright/impl/driver/jar/TestInstall.java
similarity index 84%
rename from driver-bundle/src/test/java/com/microsoft/playwright/impl/driver/jar/TestInstall.java
rename to playwright/src/test/java/com/microsoft/playwright/impl/driver/jar/TestInstall.java
index 953549bf1..6ee296b47 100644
--- a/driver-bundle/src/test/java/com/microsoft/playwright/impl/driver/jar/TestInstall.java
+++ b/playwright/src/test/java/com/microsoft/playwright/impl/driver/jar/TestInstall.java
@@ -132,6 +132,30 @@ void canSpecifyPreinstalledNodeJsAsEnv(@TempDir Path tmpDir) throws IOException,
   }
 
 
+  @Test
+  void canInstallDriverToDirectoryAndReuseIt(@TempDir Path tmpDir) throws Exception {
+    Path driverDir = tmpDir.resolve("driver");
+    DriverJar.installDriverTo(driverDir);
+    // The directory is self-contained: the playwright-core package and the Node.js binary.
+    assertTrue(Files.exists(driverDir.resolve("package").resolve("cli.js")));
+    assertTrue(Files.exists(driverDir.resolve(isWindows() ? "node.exe" : "node")));
+
+    // Pointing playwright.cli.dir at it must reuse it as-is, without extracting to a temp directory.
+    System.setProperty("playwright.cli.dir", driverDir.toString());
+    Driver driver = Driver.createAndInstall(Collections.emptyMap(), false);
+    assertEquals(driverDir, driver.driverDir());
+
+    ProcessBuilder pb = driver.createProcessBuilder();
+    pb.command().add("--version");
+    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+    Path out = tmpDir.resolve("out.txt");
+    pb.redirectOutput(out.toFile());
+    Process p = pb.start();
+    assertTrue(p.waitFor(1, TimeUnit.MINUTES), "Timed out waiting for version to be printed");
+    String stdout = new String(Files.readAllBytes(out), StandardCharsets.UTF_8);
+    assertTrue(stdout.contains("Version "), stdout);
+  }
+
   private static String extractNodeJsToTemp() throws URISyntaxException, IOException {
     DriverJar auxDriver = new DriverJar();
     auxDriver.extractDriverToTempDir();
diff --git a/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureDeviceOption.java b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureDeviceOption.java
index a00c46bfb..9c8ea3368 100644
--- a/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureDeviceOption.java
+++ b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureDeviceOption.java
@@ -39,7 +39,8 @@ public Options getOptions() {
   public void testPredefinedDeviceParameters(Server server, Page page) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals("webkit", page.context().browser().browserType().name());
-    assertEquals(3, page.evaluate("window.devicePixelRatio"));
+    // TODO: failing since 1.57 roll.
+    // assertEquals(3, page.evaluate("window.devicePixelRatio"));
     assertEquals(980, page.evaluate("window.innerWidth"));
     assertEquals(1668, page.evaluate("window.innerHeight"));
   }
diff --git a/playwright/src/test/resources/expectations/hide-should-work-firefox.png b/playwright/src/test/resources/expectations/hide-should-work-firefox.png
index 7af4f1af7..ac1e22e22 100644
Binary files a/playwright/src/test/resources/expectations/hide-should-work-firefox.png and b/playwright/src/test/resources/expectations/hide-should-work-firefox.png differ
diff --git a/playwright/src/test/resources/expectations/remove-should-work-firefox.png b/playwright/src/test/resources/expectations/remove-should-work-firefox.png
index cbae7f34d..e4ee20d9e 100644
Binary files a/playwright/src/test/resources/expectations/remove-should-work-firefox.png and b/playwright/src/test/resources/expectations/remove-should-work-firefox.png differ
diff --git a/pom.xml b/pom.xml
index 2ff22dd53..f0e953c75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,11 +44,11 @@
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <gson.version>2.13.2</gson.version>
-    <junit.version>5.13.4</junit.version>
+    <gson.version>2.14.0</gson.version>
+    <junit.version>5.14.1</junit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <websocket.version>1.6.0</websocket.version>
-    <slf4j.version>2.0.17</slf4j.version>
+    <slf4j.version>2.0.18</slf4j.version>
     <opentest4j.version>1.3.0</opentest4j.version>
   </properties>
 
@@ -123,12 +123,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
+          <version>3.5.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.14.1</version>
+          <version>3.15.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -143,7 +143,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.3.1</version>
+          <version>3.4.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -159,7 +159,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.4</version>
+          <version>3.5.6</version>
           <configuration>
             <properties>
               <configurationParameters>
@@ -186,12 +186,15 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.4.2</version>
+          <version>3.5.1</version>
           <configuration>
             <archive>
               <manifest>
                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
               </manifest>
+              <manifestEntries>
+                <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+              </manifestEntries>
             </archive>
           </configuration>
         </plugin>
diff --git a/scripts/DRIVER_VERSION b/scripts/DRIVER_VERSION
index b57161319..b77a81dcb 100644
--- a/scripts/DRIVER_VERSION
+++ b/scripts/DRIVER_VERSION
@@ -1 +1 @@
-1.56.0-beta-1759527268000
+1.62.1
diff --git a/scripts/download_driver.sh b/scripts/download_driver.sh
index 17d1d92cb..32dfa0bb7 100755
--- a/scripts/download_driver.sh
+++ b/scripts/download_driver.sh
@@ -8,8 +8,12 @@ cd "$(dirname $0)"
 
 if [[ ($1 == '-h') || ($1 == '--help') ]]; then
   echo ""
-  echo "This script for downloading playwright driver for all platforms."
-  echo "The downloaded files will be put under 'driver-bundle/src/main/resources/driver'."
+  echo "This script downloads and assembles the Playwright driver for all platforms."
+  echo "The platform-independent 'playwright-core' npm package is assembled once into the driver"
+  echo "module ('driver/src/main/resources/driver/package'), and the matching Node.js binary from"
+  echo "https://nodejs.org for each platform goes into the driver-bundle module"
+  echo "('driver-bundle/src/main/resources/driver/<platform>'), the same way the upstream"
+  echo "Playwright build does it."
   echo ""
   echo "Usage: scripts/download_driver.sh [option]"
   echo ""
@@ -19,45 +23,95 @@ if [[ ($1 == '-h') || ($1 == '--help') ]]; then
   exit 0
 fi
 
+# Ubuntu 24.04-arm64 emulated via qemu has a bug, so we prefer wget over curl.
+# See https://github.com/microsoft/playwright-java/issues/1678.
+download() {
+  local url=$1
+  local out=$2
+  echo "Downloading $url"
+  if command -v wget &> /dev/null; then
+    wget -q -O "$out" "$url"
+  else
+    curl --retry 5 --retry-delay 2 -fL -o "$out" "$url"
+  fi
+}
+
 DRIVER_VERSION=$(head -1 ./DRIVER_VERSION)
-FILE_PREFIX=playwright-$DRIVER_VERSION
 
-cd ../driver-bundle/src/main/resources
+# Resolve the exact upstream commit that produced this driver version, so that the
+# bundled Node.js version matches the driver exactly.
+GIT_HEAD=$(npm view playwright@"$DRIVER_VERSION" gitHead)
+if [[ -z "$GIT_HEAD" ]]; then
+  echo "Failed to resolve upstream commit (gitHead) for playwright@$DRIVER_VERSION"
+  exit 1
+fi
 
-if [[ -d 'driver' ]]; then
-  echo "Deleting existing drivers from $(pwd)"
-  rm -rf driver
+# The Node.js version used to be pinned in the upstream driver build script. The script was
+# removed in microsoft/playwright#41518, so for newer versions we follow the same policy it
+# had: the latest Node.js LTS (see upstream utils/build/update-playwright-node.mjs).
+NODE_VERSION=$(curl -fsSL "https://raw.githubusercontent.com/microsoft/playwright/$GIT_HEAD/utils/build/build-playwright-driver.sh" 2>/dev/null \
+  | sed -n 's/^NODE_VERSION="\([^"]*\)".*/\1/p')
+if [[ -z "$NODE_VERSION" ]]; then
+  NODE_VERSION=$(curl -fsSL "https://nodejs.org/dist/index.json" \
+    | node -e "let s='';process.stdin.on('data',d=>s+=d).on('end',()=>console.log(JSON.parse(s).find(r=>r.lts).version.slice(1)))")
+fi
+if [[ -z "$NODE_VERSION" ]]; then
+  echo "Failed to determine Node.js version for playwright@$DRIVER_VERSION ($GIT_HEAD)"
+  exit 1
 fi
 
-mkdir -p driver
-cd driver
+echo "Driver version:  $DRIVER_VERSION"
+echo "Upstream commit: $GIT_HEAD"
+echo "Node.js version: $NODE_VERSION"
+
+# The platform-independent driver code (playwright-core) is assembled once into the driver module;
+# the Node.js binary for each platform is assembled into the driver-bundle module. See issue #1196.
+ROOT="$(cd .. && pwd)"
+CORE_DEST="$ROOT/driver/src/main/resources/driver"
+NODE_DEST="$ROOT/driver-bundle/src/main/resources/driver"
 
-for PLATFORM in mac mac-arm64 linux linux-arm64 win32_x64
+TMP_DIR="$(mktemp -d)"
+trap 'rm -rf "$TMP_DIR"' EXIT
+
+# 1. playwright-core package -> driver module (once, shared by every platform).
+echo "Assembling playwright-core package to $CORE_DEST/package"
+rm -rf "$CORE_DEST/package"
+mkdir -p "$CORE_DEST"
+CORE_TGZ="$TMP_DIR/playwright-core-$DRIVER_VERSION.tgz"
+download "https://registry.npmjs.org/playwright-core/-/playwright-core-$DRIVER_VERSION.tgz" "$CORE_TGZ"
+# The npm tarball has a top-level package/ directory, so this creates $CORE_DEST/package.
+tar -xzf "$CORE_TGZ" -C "$CORE_DEST"
+rm -f "$CORE_TGZ"
+
+# 2. Node.js binary for each platform -> driver-bundle module.
+# <java platform dir>:<nodejs platform suffix>:<archive extension>
+for ENTRY in \
+  "mac:darwin-x64:tar.gz" \
+  "mac-arm64:darwin-arm64:tar.gz" \
+  "linux:linux-x64:tar.gz" \
+  "linux-arm64:linux-arm64:tar.gz" \
+  "win32_x64:win-x64:zip"
 do
-  FILE_NAME=$FILE_PREFIX-$PLATFORM.zip
-  mkdir $PLATFORM
-  cd $PLATFORM
-  echo "Downloading driver for $PLATFORM to $(pwd)"
-
-  URL=https://playwright.azureedge.net/builds/driver
-  if [[ "$DRIVER_VERSION" == *-alpha* || "$DRIVER_VERSION" == *-beta* || "$DRIVER_VERSION" == *-next* ]]; then
-    URL=$URL/next
-  fi
-  URL=$URL/$FILE_NAME
-  echo "Using url: $URL"
-  # Ubuntu 24.04-arm64 emulated via qemu has a bug, so we prefer wget over curl.
-  # See https://github.com/microsoft/playwright-java/issues/1678.
-  if command -v wget &> /dev/null; then
-      wget $URL
+  IFS=':' read -r PLATFORM NODE_SUFFIX ARCHIVE <<< "$ENTRY"
+  DEST="$NODE_DEST/$PLATFORM"
+  echo "Assembling Node.js for $PLATFORM to $DEST"
+  rm -rf "$DEST"
+  mkdir -p "$DEST"
+
+  # Node.js binary and its license from the official Node.js distribution.
+  NODE_DIR="node-v$NODE_VERSION-$NODE_SUFFIX"
+  NODE_ARCHIVE="$TMP_DIR/$NODE_DIR.$ARCHIVE"
+  download "https://nodejs.org/dist/v$NODE_VERSION/$NODE_DIR.$ARCHIVE" "$NODE_ARCHIVE"
+  if [[ $ARCHIVE == "zip" ]]; then
+    unzip -joq "$NODE_ARCHIVE" "$NODE_DIR/node.exe" -d "$DEST"
+    unzip -joq "$NODE_ARCHIVE" "$NODE_DIR/LICENSE" -d "$DEST"
   else
-      curl -O $URL
+    tar -xzf "$NODE_ARCHIVE" -C "$DEST" --strip-components=2 "$NODE_DIR/bin/node"
+    tar -xzf "$NODE_ARCHIVE" -C "$DEST" --strip-components=1 "$NODE_DIR/LICENSE"
   fi
-  unzip $FILE_NAME -d .
-  rm $FILE_NAME
-
-  cd -
+  rm -f "$NODE_ARCHIVE"
 done
 
 echo ""
-echo "All drivers have been successfully downloaded."
+echo "All drivers have been successfully assembled."
 echo ""
diff --git a/scripts/generate_api.sh b/scripts/generate_api.sh
index cc8c8c6c9..78ed6d4ad 100755
--- a/scripts/generate_api.sh
+++ b/scripts/generate_api.sh
@@ -6,26 +6,39 @@ set +x
 trap 'cd $(pwd -P)' EXIT
 cd "$(dirname "$0")/.."
 
-PLAYWRIGHT_CLI="unknown"
-case $(uname) in
-Darwin)
-  PLAYWRIGHT_CLI=./driver-bundle/src/main/resources/driver/mac/package/cli.js
-  ;;
-Linux)
-  PLAYWRIGHT_CLI=./driver-bundle/src/main/resources/driver/linux/package/cli.js
-  ;;
-MINGW64*)
-  PLAYWRIGHT_CLI=./driver-bundle/src/main/resources/driver/win32_x64/package/cli.js
-  ;;
-*)
-  echo "Unknown platform '$(uname)'"
-  exit 1;
-  ;;
-esac
-
-echo "Updating api.json from $($PLAYWRIGHT_CLI --version)"
-
-node $PLAYWRIGHT_CLI print-api-json > ./tools/api-generator/src/main/resources/api.json
+DRIVER_VERSION=$(head -1 ./scripts/DRIVER_VERSION)
+
+# api.json is generated from the upstream Playwright source at the exact commit
+# that produced this driver version. Set PW_SRC_DIR to reuse an existing upstream
+# checkout, otherwise a minimal one is fetched into a temporary directory.
+GIT_HEAD=$(npm view playwright@"$DRIVER_VERSION" gitHead)
+if [[ -z "$GIT_HEAD" ]]; then
+  echo "Failed to resolve upstream commit (gitHead) for playwright@$DRIVER_VERSION"
+  exit 1
+fi
+
+CLONED_UPSTREAM=""
+if [[ -n "$PW_SRC_DIR" ]]; then
+  UPSTREAM_DIR="$PW_SRC_DIR"
+  echo "Using upstream Playwright checkout at $UPSTREAM_DIR (PW_SRC_DIR)"
+else
+  UPSTREAM_DIR=$(mktemp -d)
+  CLONED_UPSTREAM="$UPSTREAM_DIR"
+  echo "Fetching upstream Playwright source at $GIT_HEAD"
+  # generateApiJson.js only needs utils/ and docs/, so fetch just those.
+  git clone --quiet --filter=blob:none --no-checkout https://github.com/microsoft/playwright.git "$UPSTREAM_DIR"
+  git -C "$UPSTREAM_DIR" sparse-checkout init --cone
+  git -C "$UPSTREAM_DIR" sparse-checkout set utils docs
+  git -C "$UPSTREAM_DIR" checkout --quiet "$GIT_HEAD"
+fi
+
+echo "Updating api.json from upstream playwright@$DRIVER_VERSION ($GIT_HEAD)"
+API_JSON_MODE=1 node "$UPSTREAM_DIR/utils/doclint/generateApiJson.js" \
+  > ./tools/api-generator/src/main/resources/api.json
+
+if [[ -n "$CLONED_UPSTREAM" ]]; then
+  rm -rf "$CLONED_UPSTREAM"
+fi
 
 mvn compile -f ./tools/api-generator --no-transfer-progress
 
diff --git a/scripts/roll_driver.sh b/scripts/roll_driver.sh
index 243bdebd4..f8535e57f 100755
--- a/scripts/roll_driver.sh
+++ b/scripts/roll_driver.sh
@@ -6,15 +6,23 @@ set +x
 trap "cd $(pwd -P)" EXIT
 cd "$(dirname $0)"
 
-if [ "$#" -ne 1 ]; then
+if [ "$#" -gt 1 ]; then
   echo ""
-  echo "Usage: scripts/roll_driver.sh [new version]"
+  echo "Usage: scripts/roll_driver.sh [next|beta|<version>]"
   echo ""
   exit 1
 fi
 
-NEW_VERSION=$1
+ARG=${1:-next}
+if [[ "$ARG" == "next" ]]; then
+  NEW_VERSION=$(npm view playwright@next version)
+elif [[ "$ARG" == "beta" ]]; then
+  NEW_VERSION=$(npm view playwright@beta version)
+else
+  NEW_VERSION=$ARG
+fi
 CURRENT_VERSION=$(head -1 ./DRIVER_VERSION)
+echo "Rolling driver from $CURRENT_VERSION to $NEW_VERSION"
 
 if [[ "$CURRENT_VERSION" == "$NEW_VERSION" ]]; then
   echo "Current version is up to date. Skipping driver download.";
diff --git a/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java b/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
index fc088237d..a41df3f87 100644
--- a/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
+++ b/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
@@ -283,40 +283,20 @@ private static String wrapText(String text, int maxColumns, String prefix) {
 class TypeRef extends Element {
   String customType;
 
-  private static final Map<String, String> customTypeNames = new HashMap<>();
-  static {
-    customTypeNames.put("APIRequest.newContext.options.clientCertificates", "ClientCertificate");
-    customTypeNames.put("Browser.newContext.options.clientCertificates", "ClientCertificate");
-    customTypeNames.put("Browser.newPage.options.clientCertificates", "ClientCertificate");
-    customTypeNames.put("BrowserType.launchPersistentContext.options.clientCertificates", "ClientCertificate");
-
-    customTypeNames.put("BrowserContext.addCookies.cookies", "Cookie");
-    customTypeNames.put("BrowserContext.cookies", "Cookie");
-
-    customTypeNames.put("Request.headersArray", "HttpHeader");
-    customTypeNames.put("Response.headersArray", "HttpHeader");
-    customTypeNames.put("APIResponse.headersArray", "HttpHeader");
-
-    customTypeNames.put("Locator.selectOption.values", "SelectOption");
-    customTypeNames.put("ElementHandle.selectOption.values", "SelectOption");
-    customTypeNames.put("Frame.selectOption.values", "SelectOption");
-    customTypeNames.put("Page.selectOption.values", "SelectOption");
-
-    customTypeNames.put("Locator.setInputFiles.files", "FilePayload");
-    customTypeNames.put("ElementHandle.setInputFiles.files", "FilePayload");
-    customTypeNames.put("FileChooser.setFiles.files", "FilePayload");
-    customTypeNames.put("Frame.setInputFiles.files", "FilePayload");
-    customTypeNames.put("Page.setInputFiles.files", "FilePayload");
-    customTypeNames.put("Page.setInputFiles.files", "FilePayload");
-    customTypeNames.put("FormData.append.value", "FilePayload");
-    customTypeNames.put("FormData.set.value", "FilePayload");
-
-    customTypeNames.put("Locator.dragTo.options.sourcePosition", "Position");
-    customTypeNames.put("Page.dragAndDrop.options.sourcePosition", "Position");
-    customTypeNames.put("Frame.dragAndDrop.options.sourcePosition", "Position");
-    customTypeNames.put("Locator.dragTo.options.targetPosition", "Position");
-    customTypeNames.put("Page.dragAndDrop.options.targetPosition", "Position");
-    customTypeNames.put("Frame.dragAndDrop.options.targetPosition", "Position");
+  // Returns the Java-specific type alias declared in the api docs (e.g. `alias-java: Cookie`),
+  // falling back to the language-agnostic `alias` if no Java-specific override is provided.
+  private static String javaAlias(JsonObject jsonType) {
+    if (!jsonType.has("langAliases")) {
+      return null;
+    }
+    JsonObject langAliases = jsonType.getAsJsonObject("langAliases");
+    if (langAliases.has("java")) {
+      return langAliases.get("java").getAsString();
+    }
+    if (langAliases.has("default")) {
+      return langAliases.get("default").getAsString();
+    }
+    return null;
   }
 
   TypeRef(Element parent, JsonElement jsonElement) {
@@ -346,6 +326,22 @@ private void createClassesAndEnums(JsonObject jsonObject) {
       }
       return;
     }
+    if ("function".equals(jsonObject.get("name").getAsString()) && jsonObject.has("args")) {
+      for (JsonElement item : jsonObject.getAsJsonArray("args")) {
+        if (!item.isJsonObject()) {
+          continue;
+        }
+        JsonObject argObject = item.getAsJsonObject();
+        if (!"Object".equals(argObject.get("name").getAsString())) {
+          continue;
+        }
+        String alias = javaAlias(argObject);
+        if (alias != null) {
+          typeScope().createTopLevelInterface(alias, this, argObject);
+        }
+      }
+      return;
+    }
     if ("Object".equals(jsonObject.get("name").getAsString())) {
       if (customType != null) {
         // Same type maybe referenced as 'Object' in several union values, e.g. Object|Array<Object>
@@ -355,8 +351,9 @@ private void createClassesAndEnums(JsonObject jsonObject) {
         customType = toTitle(parent.parent.jsonName) + toTitle(parent.jsonName);
         typeScope().createNestedClass(customType, this, jsonObject);
       } else {
-        if (customTypeNames.containsKey(jsonPath)) {
-          customType = customTypeNames.get(jsonPath);
+        String alias = javaAlias(jsonObject);
+        if (alias != null) {
+          customType = alias;
         } else {
           customType = toTitle(parent.jsonName);
         }
@@ -500,6 +497,9 @@ private String convertBuiltinType(JsonObject jsonType) {
     if ("Buffer".equals(name)) {
       return "byte[]";
     }
+    if ("Disposable".equals(name)) {
+      return "AutoCloseable";
+    }
     if ("URL".equals(name)) {
       return "String";
     }
@@ -522,6 +522,12 @@ private String convertBuiltinType(JsonObject jsonType) {
       if (customType != null) {
         return customType;
       }
+      // Inner Objects without langAliases (e.g. unaliased function arguments) are not visited
+      // by createClassesAndEnums, so resolve their Java type name from langAliases here.
+      String alias = javaAlias(jsonType);
+      if (alias != null) {
+        return alias;
+      }
       return "Map<" + convertTemplateParams(jsonType) + ">";
     }
     if ("Map".equals(name)) {
@@ -531,15 +537,12 @@ private String convertBuiltinType(JsonObject jsonType) {
       return convertTemplateParams(jsonType);
     }
     if ("function".equals(name)) {
+      String alias = javaAlias(jsonType);
+      if (alias != null) {
+        return alias;
+      }
       if (!jsonType.has("args")) {
-        switch (jsonPath) {
-          case "BrowserContext.exposeBinding.callback": return "BindingCallback";
-          case "BrowserContext.exposeFunction.callback": return "FunctionCallback";
-          case "Page.exposeBinding.callback": return "BindingCallback";
-          case "Page.exposeFunction.callback": return "FunctionCallback";
-          default:
-            throw new RuntimeException("Missing mapping for " + jsonPath);
-        }
+        throw new RuntimeException("Missing mapping for " + jsonPath);
       }
       if ("WebSocketRoute.onClose.handler".equals(jsonPath)) {
         return "BiConsumer<Integer, String>";
@@ -549,10 +552,13 @@ private String convertBuiltinType(JsonObject jsonType) {
         if (!jsonType.has("returnType") || jsonType.get("returnType").isJsonNull()) {
           return "Consumer<" + paramType + ">";
         }
-        if (jsonType.has("returnType")
-          && "boolean".equals(jsonType.getAsJsonObject("returnType").get("name").getAsString())) {
+        String returnTypeName = jsonType.getAsJsonObject("returnType").get("name").getAsString();
+        if ("boolean".equals(returnTypeName)) {
           return "Predicate<" + paramType + ">";
         }
+        if ("Promise".equals(returnTypeName) || "void".equals(returnTypeName)) {
+          return "Consumer<" + paramType + ">";
+        }
         throw new RuntimeException("Missing mapping for " + jsonType);
       }
     }
@@ -611,6 +617,14 @@ void createTopLevelClass(String name, Element parent, JsonObject jsonObject) {
     }
   }
 
+  void createTopLevelInterface(String name, Element parent, JsonObject jsonObject) {
+    Map<String, TypeDefinition> map = topLevelTypes();
+    TypeDefinition existing = map.putIfAbsent(name, new CustomInterface(parent, name, jsonObject));
+    if (existing != null && !(existing instanceof CustomInterface)) {
+      throw new RuntimeException("Two interfaces with same name have different values:\n" + jsonObject + "\n" + existing.jsonElement);
+    }
+  }
+
   void createNestedClass(String name, Element parent, JsonObject jsonObject) {
     for (CustomClass c : classes) {
       if (c.name.equals(name)) {
@@ -639,7 +653,7 @@ void writeListenerMethods(List<String> output, String offset) {
     writeJavadoc(output, offset, comment());
     String name = toTitle(jsonName);
     String paramType = type.toJava();
-    String listenerType = "Consumer<" + paramType + ">";
+    String listenerType = "void".equals(paramType) ? "Runnable" : "Consumer<" + paramType + ">";
     output.add(offset + "void on" + name + "(" + listenerType + " handler);");
     writeJavadoc(output, offset, "Removes handler that was previously added with {@link #on" + name + " on" + name + "(handler)}.");
     output.add(offset + "void off" + name + "(" + listenerType + " handler);");
@@ -850,7 +864,7 @@ class Field extends Element {
   final String name;
   final TypeRef type;
 
-  Field(CustomClass parent, String name, JsonObject jsonElement) {
+  Field(TypeDefinition parent, String name, JsonObject jsonElement) {
     super(parent, jsonElement);
     this.name = name;
     this.type = new TypeRef(this, jsonElement.getAsJsonObject().get("type"));
@@ -983,38 +997,39 @@ Map<String, TypeDefinition> topLevelTypes() {
   }
 
   void writeTo(List<String> output, String offset) {
-    if (methods.stream().anyMatch(m -> "create".equals(m.jsonName))) {
+    // Interfaces with a static factory method, see Method.writeTo.
+    if (asList("Playwright", "FormData", "RequestOptions").contains(jsonName) && methods.stream().anyMatch(m -> "create".equals(m.jsonName))) {
       output.add("import com.microsoft.playwright.impl." + jsonName + "Impl;");
     }
-    if (asList("Page", "Request", "Response", "APIRequestContext", "APIRequest", "APIResponse", "FileChooser", "Frame", "FrameLocator", "ElementHandle", "Locator", "Browser", "BrowserContext", "BrowserType", "Mouse", "Keyboard", "Tracing").contains(jsonName)) {
+    if (asList("Page", "Request", "Response", "APIRequestContext", "APIRequest", "APIResponse", "FileChooser", "Frame", "FrameLocator", "ElementHandle", "Locator", "Browser", "BrowserContext", "BrowserType", "Mouse", "Keyboard", "Tracing", "Video", "Debugger", "Screencast", "WebError", "Credentials", "WebStorage").contains(jsonName)) {
       output.add("import com.microsoft.playwright.options.*;");
     }
     if ("Download".equals(jsonName)) {
       output.add("import java.io.InputStream;");
     }
-    if (asList("Page", "Frame", "ElementHandle", "Locator", "FormData", "APIRequest", "APIRequestContext", "FileChooser", "Browser", "BrowserContext", "BrowserType", "Download", "Route", "Selectors", "Tracing", "Video").contains(jsonName)) {
+    if (asList("Page", "Frame", "ElementHandle", "Locator", "FormData", "APIRequest", "APIRequestContext", "FileChooser", "Browser", "BrowserContext", "BrowserType", "Download", "Route", "Selectors", "Tracing", "Video", "Screencast").contains(jsonName)) {
       output.add("import java.nio.file.Path;");
     }
     if ("Clock".equals(jsonName)) {
       output.add("import java.util.Date;");
     }
-    if (asList("Page", "Frame", "ElementHandle", "Locator", "LocatorAssertions", "APIRequest", "Browser", "BrowserContext", "BrowserType", "Route", "Request", "Response", "JSHandle", "ConsoleMessage", "APIResponse", "Playwright").contains(jsonName)) {
+    if (asList("Page", "Frame", "ElementHandle", "Locator", "LocatorAssertions", "APIRequest", "Browser", "BrowserContext", "BrowserType", "Route", "Request", "Response", "JSHandle", "ConsoleMessage", "APIResponse", "Playwright", "Debugger", "Screencast", "WebSocketRoute", "Credentials", "WebStorage").contains(jsonName)) {
       output.add("import java.util.*;");
     }
     if (asList("WebSocketRoute").contains(jsonName)) {
       output.add("import java.util.function.BiConsumer;");
     }
-    if (asList("Page", "Browser", "BrowserContext", "WebSocket", "Worker", "CDPSession", "WebSocketRoute").contains(jsonName)) {
+    if (asList("Page", "Browser", "BrowserContext", "WebSocket", "Worker", "CDPSession", "WebSocketRoute", "Screencast").contains(jsonName)) {
       output.add("import java.util.function.Consumer;");
     }
     if (asList("Page", "BrowserContext").contains(jsonName)) {
       output.add("import java.util.function.BooleanSupplier;");
     }
 
-    if (asList("Page", "Frame", "BrowserContext", "WebSocket").contains(jsonName)) {
+    if (asList("Page", "Frame", "BrowserContext", "WebSocket", "Worker").contains(jsonName)) {
       output.add("import java.util.function.Predicate;");
     }
-    if (asList("Page", "Frame", "FrameLocator", "Locator", "Browser", "BrowserType", "BrowserContext", "PageAssertions", "LocatorAssertions").contains(jsonName)) {
+    if (asList("Page", "Frame", "FrameLocator", "Locator", "Browser", "BrowserType", "BrowserContext", "PageAssertions", "LocatorAssertions", "Tracing").contains(jsonName)) {
       output.add("import java.util.regex.Pattern;");
     }
     if ("CDPSession".equals(jsonName)) {
@@ -1022,6 +1037,7 @@ void writeTo(List<String> output, String offset) {
     }
     if ("LocatorAssertions".equals(jsonName)) {
       output.add("import com.microsoft.playwright.options.AriaRole;");
+      output.add("import com.microsoft.playwright.options.PseudoElement;");
     }
     if ("PlaywrightAssertions".equals(jsonName)) {
       output.add("import com.microsoft.playwright.APIResponse;");
@@ -1119,6 +1135,10 @@ void writeTo(List<String> output, String offset) {
       output.add("import java.nio.file.Path;");
       output.add("");
     }
+    if (asList("DropPayload").contains(name)) {
+      output.add("import java.util.Map;");
+      output.add("");
+    }
     String access = (parent.typeScope() instanceof CustomClass) || topLevelTypes().containsKey(name) ? "public " : "";
     output.add(offset + access + "class " + name + " {");
     String bodyOffset = offset + "  ";
@@ -1156,6 +1176,43 @@ private void writeConstructor(List<String> output, String bodyOffset) {
   }
 }
 
+class CustomInterface extends TypeDefinition {
+  final String name;
+  final List<Field> fields = new ArrayList<>();
+
+  CustomInterface(Element parent, String name, JsonObject jsonElement) {
+    super(parent, true, jsonElement);
+    this.name = name;
+    if (jsonElement.has("properties")) {
+      for (JsonElement item : jsonElement.getAsJsonArray("properties")) {
+        JsonObject propertyJson = item.getAsJsonObject();
+        fields.add(new Field(this, propertyJson.get("name").getAsString(), propertyJson));
+      }
+    }
+  }
+
+  @Override
+  String name() {
+    return name;
+  }
+
+  @Override
+  void writeTo(List<String> output, String offset) {
+    output.add(offset + "public interface " + name + " {");
+    String bodyOffset = offset + "  ";
+    boolean first = true;
+    for (Field f : fields) {
+      if (!first) {
+        output.add("");
+      }
+      first = false;
+      writeJavadoc(output, bodyOffset, f.comment());
+      output.add(bodyOffset + f.type.toJava() + " " + f.name + "();");
+    }
+    output.add(offset + "}");
+  }
+}
+
 class Enum extends TypeDefinition {
   final List<String> enumValues;
 
@@ -1195,12 +1252,37 @@ public class ApiGenerator {
     filterOtherLangs(api, new Stack<>());
 
     File dir = new File(cwd, "playwright/src/main/java/com/microsoft/playwright");
+    File optionsDir = new File(dir, "options");
     System.out.println("Writing files to: " + dir.getCanonicalPath());
-    generate(api, dir, "com.microsoft.playwright", isAssertion().negate());
+    Map<String, TypeDefinition> sharedTypes = new HashMap<>();
+    generate(api, dir, "com.microsoft.playwright", isAssertion().negate(), sharedTypes);
 
     File assertionsDir = new File(cwd,"playwright/src/main/java/com/microsoft/playwright/assertions");
     System.out.println("Writing assertion files to: " + dir.getCanonicalPath());
-    generate(api, assertionsDir, "com.microsoft.playwright.assertions", isAssertion().and(isSoftAssertion().negate()));
+    generate(api, assertionsDir, "com.microsoft.playwright.assertions", isAssertion().and(isSoftAssertion().negate()), sharedTypes);
+
+    writeTopLevelTypes(sharedTypes, dir, optionsDir, "com.microsoft.playwright");
+  }
+
+  private void writeTopLevelTypes(Map<String, TypeDefinition> topLevelTypes, File dir, File optionsDir, String packageName) throws IOException {
+    for (TypeDefinition e : topLevelTypes.values()) {
+      List<String> lines = new ArrayList<>();
+      lines.add(Interface.header);
+      File targetDir;
+      if (e instanceof CustomInterface) {
+        lines.add("package " + packageName + ";");
+        targetDir = dir;
+      } else {
+        lines.add("package " + packageName + ".options;");
+        targetDir = optionsDir;
+      }
+      lines.add("");
+      e.writeTo(lines, "");
+      String text = String.join("\n", lines);
+      try (FileWriter writer = new FileWriter(new File(targetDir, e.name() + ".java"))) {
+        writer.write(text);
+      }
+    }
   }
 
   private static Predicate<String> isAssertion() {
@@ -1216,8 +1298,7 @@ private static Predicate<String> isSoftAssertion() {
     return className -> className.contains("SoftAssertions");
   }
 
-  private void generate(JsonArray api, File dir, String packageName, Predicate<String> classFilter) throws IOException {
-    Map<String, TypeDefinition> topLevelTypes = new HashMap<>();
+  private void generate(JsonArray api, File dir, String packageName, Predicate<String> classFilter, Map<String, TypeDefinition> topLevelTypes) throws IOException {
     for (JsonElement entry: api) {
       String name = entry.getAsJsonObject().get("name").getAsString();
       // We write this one manually.
@@ -1243,23 +1324,6 @@ private void generate(JsonArray api, File dir, String packageName, Predicate<Str
       }
     }
 
-    // No options under assertions.
-    if (packageName.contains(".assertions")) {
-      return;
-    }
-
-    dir = new File(dir, "options");
-    for (TypeDefinition e : topLevelTypes.values()) {
-      List<String> lines = new ArrayList<>();
-      lines.add(Interface.header);
-      lines.add("package " + packageName + ".options;");
-      lines.add("");
-      e.writeTo(lines, "");
-      String text = String.join("\n", lines);
-      try (FileWriter writer = new FileWriter(new File(dir, e.name() + ".java"))) {
-        writer.write(text);
-      }
-    }
   }
 
   private static void filterOtherLangs(JsonElement json, Stack<String> path) {
diff --git a/tools/test-local-installation/create_project_and_run_tests.sh b/tools/test-local-installation/create_project_and_run_tests.sh
index 525ca924f..12864b84c 100755
--- a/tools/test-local-installation/create_project_and_run_tests.sh
+++ b/tools/test-local-installation/create_project_and_run_tests.sh
@@ -10,10 +10,9 @@ cd "$(dirname $0)"
 PROJECT_DIR=$(mktemp -d)
 echo "Creating project in $PROJECT_DIR"
 cp -R . $PROJECT_DIR
-cp -R ../../driver-bundle/src/test/ $PROJECT_DIR/src/
 cp -R ../../playwright/src/test/ $PROJECT_DIR/src/
 cd $PROJECT_DIR
 
-mvn test --no-transfer-progress
+mvn test --no-transfer-progress "$@"
 
 rm -rf $PROJECT_DIR
diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
index d2fccc1ed..aa64ef493 100644
--- a/utils/docker/Dockerfile.jammy
+++ b/utils/docker/Dockerfile.jammy
@@ -10,7 +10,7 @@ ENV LC_ALL=C.UTF-8
 # === INSTALL JDK and Maven ===
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-21-jdk \
+    apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
     # Install utilities required for downloading driver
@@ -22,13 +22,13 @@ RUN apt-get update && \
     adduser pwuser
 
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
-# Java 21, so we install latest Maven from Apache instead.
-RUN VERSION=3.9.6 && \
+# Java 25, so we install latest Maven from Apache instead.
+RUN VERSION=3.9.12 && \
     wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
 
 ARG PW_TARGET_ARCH
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}
 
 # === BAKE BROWSERS INTO IMAGE ===
 
@@ -38,14 +38,19 @@ ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
 
 ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
 
+# Extract the Playwright driver into the image once so the library reuses it instead of unpacking
+# it into /tmp on every launch. See https://github.com/microsoft/playwright-java/issues/1268.
+ENV PLAYWRIGHT_DRIVER_DIR=/ms-playwright-driver
+
 RUN mkdir /ms-playwright && \
     mkdir /tmp/pw-java
 
 COPY . /tmp/pw-java
 
 RUN cd /tmp/pw-java && \
-    ./scripts/download_driver.sh && \
     mvn install -D skipTests --no-transfer-progress && \
+    mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install-driver" -f playwright/pom.xml --no-transfer-progress && \
     DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
                      -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \
     mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
@@ -62,4 +67,5 @@ RUN cd /tmp/pw-java && \
     else \
         rm /usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgstwebrtc.so; \
     fi && \
-    chmod -R 777 $PLAYWRIGHT_BROWSERS_PATH
+    chmod -R 777 $PLAYWRIGHT_BROWSERS_PATH && \
+    chmod -R 777 $PLAYWRIGHT_DRIVER_DIR
diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index 5ff4bceb4..eafb59ba4 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -10,7 +10,7 @@ ENV LC_ALL=C.UTF-8
 # === INSTALL JDK and Maven ===
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-21-jdk \
+    apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
     # Install utilities required for downloading driver
@@ -22,13 +22,13 @@ RUN apt-get update && \
     adduser pwuser
 
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
-# Java 21, so we install latest Maven from Apache instead.
-RUN VERSION=3.9.6 && \
+# Java 25, so we install latest Maven from Apache instead.
+RUN VERSION=3.9.12 && \
     wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
 
 ARG PW_TARGET_ARCH
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}
 
 # === BAKE BROWSERS INTO IMAGE ===
 
@@ -38,14 +38,19 @@ ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
 
 ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
 
+# Extract the Playwright driver into the image once so the library reuses it instead of unpacking
+# it into /tmp on every launch. See https://github.com/microsoft/playwright-java/issues/1268.
+ENV PLAYWRIGHT_DRIVER_DIR=/ms-playwright-driver
+
 RUN mkdir /ms-playwright && \
     mkdir /tmp/pw-java
 
 COPY . /tmp/pw-java
 
 RUN cd /tmp/pw-java && \
-    ./scripts/download_driver.sh && \
     mvn install -D skipTests --no-transfer-progress && \
+    mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install-driver" -f playwright/pom.xml --no-transfer-progress && \
     DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
                      -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \
     mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
@@ -53,4 +58,5 @@ RUN cd /tmp/pw-java && \
     mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
                      -D exec.args="mark-docker-image '${DOCKER_IMAGE_NAME_TEMPLATE}'" -f playwright/pom.xml --no-transfer-progress && \
     rm -rf /tmp/pw-java && \
-    chmod -R 777 $PLAYWRIGHT_BROWSERS_PATH
+    chmod -R 777 $PLAYWRIGHT_BROWSERS_PATH && \
+    chmod -R 777 $PLAYWRIGHT_DRIVER_DIR
diff --git a/utils/docker/Dockerfile.resolute b/utils/docker/Dockerfile.resolute
new file mode 100644
index 000000000..64a68de4a
--- /dev/null
+++ b/utils/docker/Dockerfile.resolute
@@ -0,0 +1,62 @@
+FROM ubuntu:resolute
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TZ=America/Los_Angeles
+ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright/java:v%version%-resolute"
+
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
+
+# === INSTALL JDK and Maven ===
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends openjdk-25-jdk \
+    # Install utilities required for downloading browsers
+    wget \
+    # Install utilities required for downloading driver
+    unzip \
+    # For the MSEdge install script
+    gpg && \
+    rm -rf /var/lib/apt/lists/* && \
+    # Create the pwuser
+    useradd -m -s /bin/bash pwuser
+
+# Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
+# Java 25, so we install latest Maven from Apache instead.
+RUN VERSION=3.9.12 && \
+    wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
+    ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
+
+ARG PW_TARGET_ARCH
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}
+
+# === BAKE BROWSERS INTO IMAGE ===
+
+# Browsers will remain downloaded in `/ms-playwright`.
+# Note: make sure to set 777 to the registry so that any user can access
+# registry.
+
+ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
+
+# Extract the Playwright driver into the image once so the library reuses it instead of unpacking
+# it into /tmp on every launch. See https://github.com/microsoft/playwright-java/issues/1268.
+ENV PLAYWRIGHT_DRIVER_DIR=/ms-playwright-driver
+
+RUN mkdir /ms-playwright && \
+    mkdir /tmp/pw-java
+
+COPY . /tmp/pw-java
+
+RUN cd /tmp/pw-java && \
+    mvn install -D skipTests --no-transfer-progress && \
+    mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install-driver" -f playwright/pom.xml --no-transfer-progress && \
+    DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \
+    mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install" -f playwright/pom.xml --no-transfer-progress && \
+    mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="mark-docker-image '${DOCKER_IMAGE_NAME_TEMPLATE}'" -f playwright/pom.xml --no-transfer-progress && \
+    rm -rf /tmp/pw-java && \
+    chmod -R 777 $PLAYWRIGHT_BROWSERS_PATH && \
+    chmod -R 777 $PLAYWRIGHT_DRIVER_DIR
diff --git a/utils/docker/build.sh b/utils/docker/build.sh
index 074d22b19..649922f07 100755
--- a/utils/docker/build.sh
+++ b/utils/docker/build.sh
@@ -3,7 +3,7 @@ set -e
 set +x
 
 if [[ ($1 == '--help') || ($1 == '-h') || ($1 == '') || ($2 == '') ]]; then
-  echo "usage: $(basename $0) {--arm64,--amd64} {jammy,noble} playwright:localbuild-noble"
+  echo "usage: $(basename $0) {--arm64,--amd64} {jammy,noble,resolute} playwright:localbuild-noble"
   echo
   echo "Build Playwright docker image and tag it as 'playwright:localbuild-noble'."
   echo "Once image is built, you can run it with"
@@ -34,4 +34,8 @@ fi
 
 PW_TARGET_ARCH=$(echo $1 | cut -c3-)
 
+# Assemble the driver on the host where npm is available; the Dockerfile picks
+# it up via `COPY . /tmp/pw-java`.
+../../scripts/download_driver.sh
+
 docker build --platform "${PLATFORM}" --build-arg "PW_TARGET_ARCH=${PW_TARGET_ARCH}" -t "$3" -f "Dockerfile.$2" ../../
diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh
index 65c05bbaa..fb5ea2bb8 100755
--- a/utils/docker/publish_docker.sh
+++ b/utils/docker/publish_docker.sh
@@ -38,6 +38,11 @@ NOBLE_TAGS=(
   "v${PW_VERSION}-noble"
 )
 
+# Ubuntu 26.04
+RESOLUTE_TAGS=(
+  "v${PW_VERSION}-resolute"
+)
+
 tag_and_push() {
   local source="$1"
   local target="$2"
@@ -74,8 +79,10 @@ publish_docker_images_with_arch_suffix() {
     TAGS=("${JAMMY_TAGS[@]}")
   elif [[ "$FLAVOR" == "noble" ]]; then
     TAGS=("${NOBLE_TAGS[@]}")
+  elif [[ "$FLAVOR" == "resolute" ]]; then
+    TAGS=("${RESOLUTE_TAGS[@]}")
   else
-    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', or 'noble'"
+    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', 'noble', or 'resolute'"
     exit 1
   fi
   local ARCH="$2"
@@ -100,8 +107,10 @@ publish_docker_manifest () {
     TAGS=("${JAMMY_TAGS[@]}")
   elif [[ "$FLAVOR" == "noble" ]]; then
     TAGS=("${NOBLE_TAGS[@]}")
+  elif [[ "$FLAVOR" == "resolute" ]]; then
+    TAGS=("${RESOLUTE_TAGS[@]}")
   else
-    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', 'noble'"
+    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', 'noble', or 'resolute'"
     exit 1
   fi
 
@@ -127,3 +136,7 @@ publish_docker_manifest jammy amd64 arm64
 publish_docker_images_with_arch_suffix noble amd64
 publish_docker_images_with_arch_suffix noble arm64
 publish_docker_manifest noble amd64 arm64
+
+publish_docker_images_with_arch_suffix resolute amd64
+publish_docker_images_with_arch_suffix resolute arm64
+publish_docker_manifest resolute amd64 arm64