Backport of JDK-8322041 -------------
Commit messages: - Backport b061b6678fde891974d5b58cec963b3481099a8d Changes: https://git.openjdk.org/jdk22/pull/22/files Webrev: https://webrevs.openjdk.org/?repo=jdk22&pr=22&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8322041 Stats: 290 lines in 36 files changed: 166 ins; 15 del; 109 mod Patch: https://git.openjdk.org/jdk22/pull/22.diff Fetch: git fetch https://git.openjdk.org/jdk22.git pull/22/head:pull/22 PR: https://git.openjdk.org/jdk22/pull/22
