Backport jdk8366298

[tstuefe]

---

• I confirm that I make this contribution in accordance with the OpenJDK Interim AI Policy.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk25u-dev.git pull/550/head:pull/550
$ git checkout pull/550

Update a local copy of the PR:
$ git checkout pull/550
$ git pull https://git.openjdk.org/jdk25u-dev.git pull/550/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 550

View PR using the GUI difftool:
$ git pr show -t 550

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk25u-dev/pull/550.diff

[bridgekeeper]

👋 Welcome back stuefe! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.