diff --git a/README.md b/README.md
index 2fa79d45b..e0e06d3cd 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->117.0.5938.62<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->17.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->117.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->119.0.6045.9<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->17.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->118.0.1<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 Headless execution is supported for all the browsers on all platforms. Check out [system requirements](https://playwright.dev/java/docs/next/intro/#system-requirements) for details.
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java b/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
index f046e8f47..83be107de 100644
--- a/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
+++ b/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
@@ -1878,7 +1878,7 @@ default void scrollIntoViewIfNeeded() {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -1909,7 +1909,7 @@ default List<String> selectOption(String values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -1938,7 +1938,7 @@ default List<String> selectOption(String values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -1969,7 +1969,7 @@ default List<String> selectOption(ElementHandle values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -1998,7 +1998,7 @@ default List<String> selectOption(ElementHandle values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -2029,7 +2029,7 @@ default List<String> selectOption(String[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -2058,7 +2058,7 @@ default List<String> selectOption(String[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -2089,7 +2089,7 @@ default List<String> selectOption(SelectOption values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -2118,7 +2118,7 @@ default List<String> selectOption(SelectOption values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -2149,7 +2149,7 @@ default List<String> selectOption(ElementHandle[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -2178,7 +2178,7 @@ default List<String> selectOption(ElementHandle[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
@@ -2209,7 +2209,7 @@ default List<String> selectOption(SelectOption[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * handle.selectOption("blue");
    * // single selection matching the label
    * handle.selectOption(new SelectOption().setLabel("Blue"));
diff --git a/playwright/src/main/java/com/microsoft/playwright/Frame.java b/playwright/src/main/java/com/microsoft/playwright/Frame.java
index bf3857f69..ca6bf5a56 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Frame.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Frame.java
@@ -4058,7 +4058,7 @@ default ElementHandle querySelector(String selector) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4091,7 +4091,7 @@ default List<String> selectOption(String selector, String values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4122,7 +4122,7 @@ default List<String> selectOption(String selector, String values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4155,7 +4155,7 @@ default List<String> selectOption(String selector, ElementHandle values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4186,7 +4186,7 @@ default List<String> selectOption(String selector, ElementHandle values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4219,7 +4219,7 @@ default List<String> selectOption(String selector, String[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4250,7 +4250,7 @@ default List<String> selectOption(String selector, String[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4283,7 +4283,7 @@ default List<String> selectOption(String selector, SelectOption values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4314,7 +4314,7 @@ default List<String> selectOption(String selector, SelectOption values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4347,7 +4347,7 @@ default List<String> selectOption(String selector, ElementHandle[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4378,7 +4378,7 @@ default List<String> selectOption(String selector, ElementHandle[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -4411,7 +4411,7 @@ default List<String> selectOption(String selector, SelectOption[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * frame.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * frame.selectOption("select#colors", new SelectOption().setLabel("Blue"));
diff --git a/playwright/src/main/java/com/microsoft/playwright/Locator.java b/playwright/src/main/java/com/microsoft/playwright/Locator.java
index 44cb69323..455fd77cb 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Locator.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Locator.java
@@ -2096,6 +2096,10 @@ public WaitForOptions setTimeout(double timeout) {
   /**
    * Returns an array of {@code node.innerText} values for all matching nodes.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert text on the page, prefer {@link LocatorAssertions#hasText LocatorAssertions.hasText()} with {@code
+   * useInnerText} option to avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions
+   * guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * String[] texts = page.getByRole(AriaRole.LINK).allInnerTexts();
@@ -2107,6 +2111,9 @@ public WaitForOptions setTimeout(double timeout) {
   /**
    * Returns an array of {@code node.textContent} values for all matching nodes.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert text on the page, prefer {@link LocatorAssertions#hasText LocatorAssertions.hasText()} to avoid
+   * flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * String[] texts = page.getByRole(AriaRole.LINK).allTextContents();
@@ -2380,6 +2387,10 @@ default void click() {
   /**
    * Returns the number of elements matching the locator.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert the number of elements on the page, prefer {@link LocatorAssertions#hasCount
+   * LocatorAssertions.hasCount()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * int count = page.getByRole(AriaRole.LISTITEM).count();
@@ -2986,6 +2997,10 @@ default void focus() {
   /**
    * Returns the matching element's attribute value.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert an element's attribute, prefer {@link LocatorAssertions#hasAttribute
+   * LocatorAssertions.hasAttribute()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * @param name Attribute name to get the value for.
    * @since v1.14
    */
@@ -2995,6 +3010,10 @@ default String getAttribute(String name) {
   /**
    * Returns the matching element's attribute value.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert an element's attribute, prefer {@link LocatorAssertions#hasAttribute
+   * LocatorAssertions.hasAttribute()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * @param name Attribute name to get the value for.
    * @since v1.14
    */
@@ -3634,6 +3653,10 @@ default String innerHTML() {
    * Returns the <a href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/innerText">{@code
    * element.innerText}</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert text on the page, prefer {@link LocatorAssertions#hasText LocatorAssertions.hasText()} with {@code
+   * useInnerText} option to avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions
+   * guide</a> for more details.
+   *
    * @since v1.14
    */
   default String innerText() {
@@ -3643,12 +3666,19 @@ default String innerText() {
    * Returns the <a href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/innerText">{@code
    * element.innerText}</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert text on the page, prefer {@link LocatorAssertions#hasText LocatorAssertions.hasText()} with {@code
+   * useInnerText} option to avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions
+   * guide</a> for more details.
+   *
    * @since v1.14
    */
   String innerText(InnerTextOptions options);
   /**
    * Returns the value for the matching {@code <input>} or {@code <textarea>} or {@code <select>} element.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert input value, prefer {@link LocatorAssertions#hasValue LocatorAssertions.hasValue()} to avoid
+   * flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * String value = page.getByRole(AriaRole.TEXTBOX).inputValue();
@@ -3669,6 +3699,9 @@ default String inputValue() {
   /**
    * Returns the value for the matching {@code <input>} or {@code <textarea>} or {@code <select>} element.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert input value, prefer {@link LocatorAssertions#hasValue LocatorAssertions.hasValue()} to avoid
+   * flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * String value = page.getByRole(AriaRole.TEXTBOX).inputValue();
@@ -3687,6 +3720,10 @@ default String inputValue() {
   /**
    * Returns whether the element is checked. Throws if the element is not a checkbox or radio input.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that checkbox is checked, prefer {@link LocatorAssertions#isChecked LocatorAssertions.isChecked()}
+   * to avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more
+   * details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean checked = page.getByRole(AriaRole.CHECKBOX).isChecked();
@@ -3700,6 +3737,10 @@ default boolean isChecked() {
   /**
    * Returns whether the element is checked. Throws if the element is not a checkbox or radio input.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that checkbox is checked, prefer {@link LocatorAssertions#isChecked LocatorAssertions.isChecked()}
+   * to avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more
+   * details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean checked = page.getByRole(AriaRole.CHECKBOX).isChecked();
@@ -3712,6 +3753,10 @@ default boolean isChecked() {
    * Returns whether the element is disabled, the opposite of <a
    * href="https://playwright.dev/java/docs/actionability#enabled">enabled</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that an element is disabled, prefer {@link LocatorAssertions#isDisabled
+   * LocatorAssertions.isDisabled()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean disabled = page.getByRole(AriaRole.BUTTON).isDisabled();
@@ -3726,6 +3771,10 @@ default boolean isDisabled() {
    * Returns whether the element is disabled, the opposite of <a
    * href="https://playwright.dev/java/docs/actionability#enabled">enabled</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that an element is disabled, prefer {@link LocatorAssertions#isDisabled
+   * LocatorAssertions.isDisabled()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean disabled = page.getByRole(AriaRole.BUTTON).isDisabled();
@@ -3737,6 +3786,10 @@ default boolean isDisabled() {
   /**
    * Returns whether the element is <a href="https://playwright.dev/java/docs/actionability#editable">editable</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that an element is editable, prefer {@link LocatorAssertions#isEditable
+   * LocatorAssertions.isEditable()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean editable = page.getByRole(AriaRole.TEXTBOX).isEditable();
@@ -3750,6 +3803,10 @@ default boolean isEditable() {
   /**
    * Returns whether the element is <a href="https://playwright.dev/java/docs/actionability#editable">editable</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that an element is editable, prefer {@link LocatorAssertions#isEditable
+   * LocatorAssertions.isEditable()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean editable = page.getByRole(AriaRole.TEXTBOX).isEditable();
@@ -3761,6 +3818,10 @@ default boolean isEditable() {
   /**
    * Returns whether the element is <a href="https://playwright.dev/java/docs/actionability#enabled">enabled</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that an element is enabled, prefer {@link LocatorAssertions#isEnabled
+   * LocatorAssertions.isEnabled()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean enabled = page.getByRole(AriaRole.BUTTON).isEnabled();
@@ -3774,6 +3835,10 @@ default boolean isEnabled() {
   /**
    * Returns whether the element is <a href="https://playwright.dev/java/docs/actionability#enabled">enabled</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that an element is enabled, prefer {@link LocatorAssertions#isEnabled
+   * LocatorAssertions.isEnabled()} to avoid flakiness. See <a
+   * href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean enabled = page.getByRole(AriaRole.BUTTON).isEnabled();
@@ -3786,6 +3851,9 @@ default boolean isEnabled() {
    * Returns whether the element is hidden, the opposite of <a
    * href="https://playwright.dev/java/docs/actionability#visible">visible</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that element is hidden, prefer {@link LocatorAssertions#isHidden LocatorAssertions.isHidden()} to
+   * avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean hidden = page.getByRole(AriaRole.BUTTON).isHidden();
@@ -3800,6 +3868,9 @@ default boolean isHidden() {
    * Returns whether the element is hidden, the opposite of <a
    * href="https://playwright.dev/java/docs/actionability#visible">visible</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that element is hidden, prefer {@link LocatorAssertions#isHidden LocatorAssertions.isHidden()} to
+   * avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean hidden = page.getByRole(AriaRole.BUTTON).isHidden();
@@ -3811,6 +3882,10 @@ default boolean isHidden() {
   /**
    * Returns whether the element is <a href="https://playwright.dev/java/docs/actionability#visible">visible</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that element is visible, prefer {@link LocatorAssertions#isVisible LocatorAssertions.isVisible()}
+   * to avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more
+   * details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean visible = page.getByRole(AriaRole.BUTTON).isVisible();
@@ -3824,6 +3899,10 @@ default boolean isVisible() {
   /**
    * Returns whether the element is <a href="https://playwright.dev/java/docs/actionability#visible">visible</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert that element is visible, prefer {@link LocatorAssertions#isVisible LocatorAssertions.isVisible()}
+   * to avoid flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more
+   * details.
+   *
    * <p> **Usage**
    * <pre>{@code
    * boolean visible = page.getByRole(AriaRole.BUTTON).isVisible();
@@ -4951,6 +5030,9 @@ default void tap() {
   /**
    * Returns the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent">{@code node.textContent}</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert text on the page, prefer {@link LocatorAssertions#hasText LocatorAssertions.hasText()} to avoid
+   * flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * @since v1.14
    */
   default String textContent() {
@@ -4959,6 +5041,9 @@ default String textContent() {
   /**
    * Returns the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent">{@code node.textContent}</a>.
    *
+   * <p> <strong>NOTE:</strong> If you need to assert text on the page, prefer {@link LocatorAssertions#hasText LocatorAssertions.hasText()} to avoid
+   * flakiness. See <a href="https://playwright.dev/java/docs/test-assertions">assertions guide</a> for more details.
+   *
    * @since v1.14
    */
   String textContent(TextContentOptions options);
diff --git a/playwright/src/main/java/com/microsoft/playwright/Page.java b/playwright/src/main/java/com/microsoft/playwright/Page.java
index 50522ee41..50611e915 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Page.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Page.java
@@ -6257,7 +6257,7 @@ default byte[] screenshot() {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6290,7 +6290,7 @@ default List<String> selectOption(String selector, String values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6321,7 +6321,7 @@ default List<String> selectOption(String selector, String values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6354,7 +6354,7 @@ default List<String> selectOption(String selector, ElementHandle values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6385,7 +6385,7 @@ default List<String> selectOption(String selector, ElementHandle values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6418,7 +6418,7 @@ default List<String> selectOption(String selector, String[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6449,7 +6449,7 @@ default List<String> selectOption(String selector, String[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6482,7 +6482,7 @@ default List<String> selectOption(String selector, SelectOption values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6513,7 +6513,7 @@ default List<String> selectOption(String selector, SelectOption values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6546,7 +6546,7 @@ default List<String> selectOption(String selector, ElementHandle[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6577,7 +6577,7 @@ default List<String> selectOption(String selector, ElementHandle[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -6610,7 +6610,7 @@ default List<String> selectOption(String selector, SelectOption[] values) {
    *
    * <p> **Usage**
    * <pre>{@code
-   * // single selection matching the value
+   * // Single selection matching the value or label
    * page.selectOption("select#colors", "blue");
    * // single selection matching both the value and the label
    * page.selectOption("select#colors", new SelectOption().setLabel("Blue"));
@@ -7818,8 +7818,8 @@ default ElementHandle waitForSelector(String selector) {
    */
   ElementHandle waitForSelector(String selector, WaitForSelectorOptions options);
   /**
-   * The method will block until the codition returns true. All Playwright events will be dispatched while the method is
-   * waiting for the codition.
+   * The method will block until the condition returns true. All Playwright events will be dispatched while the method is
+   * waiting for the condition.
    *
    * <p> **Usage**
    *
@@ -7831,15 +7831,15 @@ default ElementHandle waitForSelector(String selector) {
    * page.waitForCondition(() -> messages.size() > 3);
    * }</pre>
    *
-   * @param condition Codition to wait for.
+   * @param condition Condition to wait for.
    * @since v1.32
    */
   default void waitForCondition(BooleanSupplier condition) {
     waitForCondition(condition, null);
   }
   /**
-   * The method will block until the codition returns true. All Playwright events will be dispatched while the method is
-   * waiting for the codition.
+   * The method will block until the condition returns true. All Playwright events will be dispatched while the method is
+   * waiting for the condition.
    *
    * <p> **Usage**
    *
@@ -7851,7 +7851,7 @@ default void waitForCondition(BooleanSupplier condition) {
    * page.waitForCondition(() -> messages.size() > 3);
    * }</pre>
    *
-   * @param condition Codition to wait for.
+   * @param condition Condition to wait for.
    * @since v1.32
    */
   void waitForCondition(BooleanSupplier condition, WaitForConditionOptions options);
diff --git a/playwright/src/main/java/com/microsoft/playwright/WebError.java b/playwright/src/main/java/com/microsoft/playwright/WebError.java
index 6aa741cf2..70541e6df 100644
--- a/playwright/src/main/java/com/microsoft/playwright/WebError.java
+++ b/playwright/src/main/java/com/microsoft/playwright/WebError.java
@@ -18,7 +18,7 @@
 
 
 /**
- * {@code WebError} class represents an unhandled exeception thrown in the page. It is dispatched via the {@link
+ * {@code WebError} class represents an unhandled exception thrown in the page. It is dispatched via the {@link
  * BrowserContext#onWebError BrowserContext.onWebError()} event.
  * <pre>{@code
  * // Log all uncaught errors to the terminal
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 c2318052a..f6295259b 100644
--- a/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java
+++ b/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java
@@ -661,9 +661,22 @@ default void isInViewport() {
    * Ensures that {@code Locator} points to an <a href="https://playwright.dev/java/docs/actionability#attached">attached</a>
    * and <a href="https://playwright.dev/java/docs/actionability#visible">visible</a> DOM node.
    *
+   * <p> To check that at least one element from the list is visible, use {@link Locator#first Locator.first()}.
+   *
    * <p> **Usage**
    * <pre>{@code
+   * // A specific element is visible.
    * assertThat(page.getByText("Welcome")).isVisible();
+   *
+   * // At least one item in the list is visible.
+   * asserThat(page.getByTestId("todo-item").first()).isVisible();
+   *
+   * // At least one of the two elements is visible, possibly both.
+   * asserThat(
+   *   page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign in"))
+   *     .or(page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")))
+   *     .first()
+   * ).isVisible();
    * }</pre>
    *
    * @since v1.20
@@ -675,9 +688,22 @@ default void isVisible() {
    * Ensures that {@code Locator} points to an <a href="https://playwright.dev/java/docs/actionability#attached">attached</a>
    * and <a href="https://playwright.dev/java/docs/actionability#visible">visible</a> DOM node.
    *
+   * <p> To check that at least one element from the list is visible, use {@link Locator#first Locator.first()}.
+   *
    * <p> **Usage**
    * <pre>{@code
+   * // A specific element is visible.
    * assertThat(page.getByText("Welcome")).isVisible();
+   *
+   * // At least one item in the list is visible.
+   * asserThat(page.getByTestId("todo-item").first()).isVisible();
+   *
+   * // At least one of the two elements is visible, possibly both.
+   * asserThat(
+   *   page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign in"))
+   *     .or(page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")))
+   *     .first()
+   * ).isVisible();
    * }</pre>
    *
    * @since v1.20
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 f567f0305..e2edadeb8 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -672,8 +672,7 @@ protected void handleEvent(String event, JsonObject params) {
         bindingCall.call(binding);
       }
     } else if ("console".equals(event)) {
-      String guid = params.getAsJsonObject("message").get("guid").getAsString();
-      ConsoleMessageImpl message = connection.getExistingObject(guid);
+      ConsoleMessageImpl message = new ConsoleMessageImpl(connection, params);
       listeners.notify(BrowserContextImpl.EventType.CONSOLE, message);
       PageImpl page = message.page();
       if (page != null) {
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 005649a5e..538e7f038 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java
@@ -183,7 +183,7 @@ private BrowserContextImpl newContextImpl(NewContextOptions options) {
     }
     if (options.recordVideoDir != null) {
       JsonObject recordVideo = new JsonObject();
-      recordVideo.addProperty("dir", options.recordVideoDir.toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
       if (options.recordVideoSize != null) {
         recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
       }
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 e12475090..a961919e7 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserTypeImpl.java
@@ -33,8 +33,6 @@
 import static com.microsoft.playwright.impl.Utils.convertType;
 
 class BrowserTypeImpl extends ChannelOwner implements BrowserType {
-  LocalUtils localUtils;
-
   BrowserTypeImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
   }
@@ -203,7 +201,7 @@ private BrowserContextImpl launchPersistentContextImpl(Path userDataDir, LaunchP
     }
     if (options.recordVideoDir != null) {
       JsonObject recordVideo = new JsonObject();
-      recordVideo.addProperty("dir", options.recordVideoDir.toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
       if (options.recordVideoSize != null) {
         recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
       }
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 0826ff3f8..776b0f9db 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ChannelOwner.java
@@ -18,11 +18,11 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -34,6 +34,7 @@ class ChannelOwner extends LoggingSupport {
   final String type;
   final String guid;
   final JsonObject initializer;
+  private boolean wasCollected;
 
   protected ChannelOwner(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     this(parent.connection, parent, type, guid, initializer);
@@ -57,15 +58,16 @@ private ChannelOwner(Connection connection, ChannelOwner parent, String type, St
     }
   }
 
-  void disconnect() {
+  void disposeChannelOwner(boolean wasGarbageCollected) {
     // Clean up from parent and connection.
     if (parent != null) {
       parent.objects.remove(guid);
     }
     connection.unregisterObject(guid);
+    wasCollected = wasGarbageCollected;
     // Dispose all children.
     for (ChannelOwner child : new ArrayList<>(objects.values())) {
-      child.disconnect();
+      child.disposeChannelOwner(wasGarbageCollected);
     }
     objects.clear();
   }
@@ -91,6 +93,7 @@ <T> T withLogging(String apiName, Supplier<T> code) {
   }
 
   WaitableResult<JsonElement> sendMessageAsync(String method, JsonObject params) {
+    checkNotCollected();
     return connection.sendMessageAsync(guid, method, params);
   }
 
@@ -99,9 +102,15 @@ JsonElement sendMessage(String method) {
   }
 
   JsonElement sendMessage(String method, JsonObject params) {
+    checkNotCollected();
     return connection.sendMessage(guid, method, params);
   }
 
+  private void checkNotCollected() {
+    if (wasCollected)
+      throw new PlaywrightException("The object has been collected to prevent unbounded heap growth.");
+  }
+
   <T> T runUntil(Runnable code, Waitable<T> waitable) {
     try {
       code.run();
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 e268aef72..e06a0d3a9 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/Connection.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/Connection.java
@@ -252,7 +252,8 @@ private void dispatch(Message message) {
       return;
     }
     if (message.method.equals("__dispose__")) {
-      object.disconnect();
+      boolean wasCollected = message.params.has("reason") && "gc".equals(message.params.get("reason").getAsString());
+      object.disposeChannelOwner(wasCollected);
       return;
     }
     object.handleEvent(message.method, message.params);
@@ -293,9 +294,6 @@ private ChannelOwner createRemoteObject(String parentGuid, JsonObject params) {
       case "BrowserContext":
         result = new BrowserContextImpl(parent, type, guid, initializer);
         break;
-      case "ConsoleMessage":
-        result = new ConsoleMessageImpl(parent, type, guid, initializer);
-        break;
       case "Dialog":
         result = new DialogImpl(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 eb5a239c6..e5aa1af1f 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ConsoleMessageImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ConsoleMessageImpl.java
@@ -27,17 +27,20 @@
 
 import static com.microsoft.playwright.impl.Serialization.gson;
 
-public class ConsoleMessageImpl extends ChannelOwner implements ConsoleMessage {
+public class ConsoleMessageImpl implements ConsoleMessage {
+  private final Connection connection;
   private PageImpl page;
+  private final JsonObject initializer;
 
-  public ConsoleMessageImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
-    super(parent, type, guid, initializer);
+  public ConsoleMessageImpl(Connection connection, JsonObject initializer) {
+    this.connection = connection;
     // Note: currently, we only report console messages for pages and they always have a page.
     // However, in the future we might report console messages for service workers or something else,
     // where page() would be null.
     if (initializer.has("page")) {
       page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
     }
+    this.initializer = initializer;
   }
 
   public String type() {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java
index 3b8213188..45f7935d0 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java
@@ -105,7 +105,7 @@ private void hasAttribute(String name, ExpectedTextValue expectedText, Object ex
     if (expectedValue instanceof Pattern) {
       message += " matching regex";
     }
-    expectImpl("to.have.attribute", expectedText, expectedValue, message, commonOptions);
+    expectImpl("to.have.attribute.value", expectedText, expectedValue, message, commonOptions);
   }
 
   @Override
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PlaywrightImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PlaywrightImpl.java
index 55786d8de..b730bd6fd 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/PlaywrightImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/PlaywrightImpl.java
@@ -63,7 +63,6 @@ public static PlaywrightImpl createImpl(CreateOptions options, boolean forceNewD
   private final BrowserTypeImpl webkit;
   private final SelectorsImpl selectors;
   private final APIRequestImpl apiRequest;
-  private final LocalUtils localUtils;
   private SharedSelectors sharedSelectors;
 
   PlaywrightImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
@@ -74,10 +73,6 @@ public static PlaywrightImpl createImpl(CreateOptions options, boolean forceNewD
 
     selectors = connection.getExistingObject(initializer.getAsJsonObject("selectors").get("guid").getAsString());
     apiRequest = new APIRequestImpl(this);
-    localUtils = connection.getExistingObject(initializer.getAsJsonObject("utils").get("guid").getAsString());
-    chromium.localUtils = localUtils;
-    firefox.localUtils = localUtils;
-    webkit.localUtils = localUtils;
   }
 
   void initSharedSelectors(PlaywrightImpl parent) {
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 86d5fd82f..e5c25a949 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/TracingImpl.java
@@ -77,19 +77,8 @@ private void stopChunkImpl(Path path) {
     connection.localUtils.zip(path, new JsonArray(), stacksId, true, includeSources);
   }
 
-  @Override
-  public void start(StartOptions options) {
-    withLogging("Tracing.start", () -> startImpl(options));
-  }
-
   @Override
   public void startChunk(StartChunkOptions options) {
-    withLogging("Tracing.startChunk", () -> {
-      startChunkImpl(options);
-    });
-  }
-
-  private void startChunkImpl(StartChunkOptions options) {
     if (options == null) {
       options = new StartChunkOptions();
     }
@@ -116,7 +105,8 @@ private void startCollectingStacks(String traceName) {
     stacksId = connection.localUtils().tracingStarted(tracesDir == null ? null : tracesDir.toString(), traceName);
   }
 
-  private void startImpl(StartOptions options) {
+  @Override
+  public void start(StartOptions options) {
     if (options == null) {
       options = new StartOptions();
     }
@@ -131,17 +121,13 @@ private void startImpl(StartOptions options) {
 
   @Override
   public void stop(StopOptions options) {
-    withLogging("Tracing.stop", () -> {
-      stopChunkImpl(options == null ? null : options.path);
-      sendMessage("tracingStop");
-    });
+    stopChunkImpl(options == null ? null : options.path);
+    sendMessage("tracingStop");
   }
 
   @Override
   public void stopChunk(StopChunkOptions options) {
-    withLogging("Tracing.stopChunk", () -> {
-      stopChunkImpl(options == null ? null : options.path);
-    });
+    stopChunkImpl(options == null ? null : options.path);
   }
 
   void setTracesDir(Path tracesDir) {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java b/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java
index 8bbc415c8..a7a0ce00f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java
@@ -379,11 +379,7 @@ void shouldPressMetaKey() {
     } else {
       assertEquals("Meta", eventData.get("key"));
     }
-    if (isFirefox()) {
-      assertEquals("OSLeft", eventData.get("code"));
-    } else {
-      assertEquals("MetaLeft", eventData.get("code"));
-    }
+    assertEquals("MetaLeft", eventData.get("code"));
     if (isFirefox() && !isMac) {
       assertFalse((Boolean) eventData.get("metaKey"), eventData.toString());
     } else {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java
index f9abaa79d..cd058555c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java
@@ -135,4 +135,14 @@ void shouldNotAllowToAccessFrameOnPopupMainRequest() {
     assertTrue(error[0].getMessage().contains("Frame for this navigation request is not available"), error[0].getMessage());
   }
 
+  @Test
+  void shouldThrowIfRequestWasGCed() {
+    List<Request> requests = new ArrayList<>();
+    page.onRequest(req -> requests.add(req));
+    for (int i = 0; i < 1001; i++) {
+      page.navigate(server.EMPTY_PAGE);
+    }
+    PlaywrightException e = assertThrows(PlaywrightException.class, () -> requests.get(0).response());
+    assertEquals("The object has been collected to prevent unbounded heap growth.", e.getMessage());
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java b/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java
index 0fe4f75a0..91eefe6d5 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java
@@ -389,7 +389,7 @@ void shouldWorkWithRedirectsForSubresources() {
     Request r = intercepted.get(1);
     for (String url : asList("/one-style.css", "/two-style.css", "/three-style.css", "/four-style.css")) {
       assertEquals("stylesheet", r.resourceType());
-      assertTrue(r.url().contains(url));
+      assertTrue(r.url().contains(url), "actual: " + r.url() + "; expected: " + url);
       r = r.redirectedTo();
     }
     assertNull(r);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java b/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java
index d17e0abb4..489716e83 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.platform.commons.support.AnnotationSupport;
 
 import java.io.*;
 import java.nio.file.Files;
@@ -36,6 +37,7 @@
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
 
+import static com.microsoft.playwright.Utils.relativePathOrSkipTest;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -145,8 +147,7 @@ void shouldUploadLargeFileWithRelativePath(@TempDir Path tmpDir) throws IOExcept
       "    return events;\n" +
       "  }");
 
-    Path cwd = Paths.get("").toAbsolutePath();
-    Path relativeUploadPath = cwd.relativize(uploadFile);
+    Path relativeUploadPath = relativePathOrSkipTest(uploadFile);
     assertFalse(relativeUploadPath.isAbsolute());
     input.setInputFiles(relativeUploadPath);
     assertEquals("200MB.zip", input.evaluate("e => e.files[0].name"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestVideo.java b/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
new file mode 100644
index 000000000..1617154fb
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
@@ -0,0 +1,24 @@
+package com.microsoft.playwright;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static com.microsoft.playwright.Utils.relativePathOrSkipTest;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestVideo extends TestBase {
+  @Test
+  void shouldWorkWithRelativePathForRecordVideoDir(@TempDir Path tmpDir) {
+    Path relativeDir = relativePathOrSkipTest(tmpDir);
+    BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setRecordVideoSize(320, 240).setRecordVideoDir(relativeDir));
+    Page page = context.newPage();
+    Path videoPath = page.video().path();
+    context.close();
+    assertTrue(videoPath.isAbsolute(), "videosPath = " + videoPath);
+    assertTrue(Files.exists(videoPath), "videosPath = " + videoPath);
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/Utils.java b/playwright/src/test/java/com/microsoft/playwright/Utils.java
index dff6bab20..f4640f60a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/Utils.java
+++ b/playwright/src/test/java/com/microsoft/playwright/Utils.java
@@ -19,11 +19,13 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
+import org.junit.jupiter.api.Assumptions;
 
 import java.io.*;
 import java.net.ServerSocket;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -214,4 +216,17 @@ static String generateDifferentOriginHostname(final Server server){
   static String generateDifferentOriginPort(final Server server){
     return server.PREFIX.replace(String.valueOf(server.PORT), String.valueOf(server.PORT+1));
   }
+
+  static Path relativePathOrSkipTest(Path path) {
+    Path cwd = Paths.get("").toAbsolutePath();
+    try  {
+      return cwd.relativize(path.toAbsolutePath());
+    } catch (IllegalArgumentException e) {
+      // May happen on Windows when the path and temp are on different disks.
+      if (e.getMessage().contains("has different root")) {
+        Assumptions.assumeTrue(false, "cwd is on another disk, skipping the test.");
+      }
+      throw e;
+    }
+  }
 }
diff --git a/scripts/CLI_VERSION b/scripts/CLI_VERSION
index ebeef2f2d..860346bae 100644
--- a/scripts/CLI_VERSION
+++ b/scripts/CLI_VERSION
@@ -1 +1 @@
-1.38.0
+1.39.0-beta-1696976263000