Please review this **forwardport**. The original issue should've been committed to mainline first and then backported to jdk21, but instead it was [committed in jdk21 first](https://github.com/openjdk/jdk21/pull/130) and almost forgotten to be brought to mainline.
This PR brings the change to mainline just in time: RDP 1 is next week. ------------- Commit messages: - Backport 4fcb0b28d7eda3f147432ce8d8d27f91a0805ab6 Changes: https://git.openjdk.org/jdk/pull/16929/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=16929&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8312098 Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.org/jdk/pull/16929.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/16929/head:pull/16929 PR: https://git.openjdk.org/jdk/pull/16929
