backport to 27 --------- - [X] I confirm that I make this contribution in accordance with the [OpenJDK Interim AI Policy](https://openjdk.org/legal/ai).
------------- Commit messages: - Backport dc4bb5acbe5d766f5fe389d8aeac0cc649f4f776 Changes: https://git.openjdk.org/jdk/pull/31484/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=31484&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8383608 Stats: 217 lines in 5 files changed: 199 ins; 5 del; 13 mod Patch: https://git.openjdk.org/jdk/pull/31484.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/31484/head:pull/31484 PR: https://git.openjdk.org/jdk/pull/31484
