This PR is a backport of https://github.com/openjdk/jdk/pull/16993
------------- Commit messages: - Backport d13302f8b06f65319426a25a9368abaf72f3c247 Changes: https://git.openjdk.org/jdk22/pull/7/files Webrev: https://webrevs.openjdk.org/?repo=jdk22&pr=7&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8321387 Stats: 103 lines in 10 files changed: 67 ins; 4 del; 32 mod Patch: https://git.openjdk.org/jdk22/pull/7.diff Fetch: git fetch https://git.openjdk.org/jdk22.git pull/7/head:pull/7 PR: https://git.openjdk.org/jdk22/pull/7
