Clean backport. -------------
Commit messages: - Backport c84866ac0dcda487fe2abc2a8841f237df0a395b Changes: https://git.openjdk.org/jdk21/pull/133/files Webrev: https://webrevs.openjdk.org/?repo=jdk21&pr=133&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8310551 Stats: 10 lines in 3 files changed: 1 ins; 3 del; 6 mod Patch: https://git.openjdk.org/jdk21/pull/133.diff Fetch: git fetch https://git.openjdk.org/jdk21.git pull/133/head:pull/133 PR: https://git.openjdk.org/jdk21/pull/133