This is the straight backport to 22 of https://github.com/openjdk/jdk/pull/17362
------------- Commit messages: - Backport 51dbd36c74c70b1b17bd73cd2c3253593300b5f0 Changes: https://git.openjdk.org/jdk22/pull/93/files Webrev: https://webrevs.openjdk.org/?repo=jdk22&pr=93&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8322100 Stats: 127 lines in 4 files changed: 99 ins; 7 del; 21 mod Patch: https://git.openjdk.org/jdk22/pull/93.diff Fetch: git fetch https://git.openjdk.org/jdk22.git pull/93/head:pull/93 PR: https://git.openjdk.org/jdk22/pull/93