This pull request contains a backport of commit [d663b5da](https://github.com/openjdk/jdk/commit/d663b5da10be1f3f33a2729e4b3605fb5e13b4d6) from the [openjdk/jdk](https://git.openjdk.org/jdk) repository.
The commit being backported was authored by Justin Lu on 11 Jan 2023 and was reviewed by Naoto Sato, Joe Darcy, Roger Riggs, Mandy Chung and Lance Andersen. Thank you ------------- Commit messages: - Backport d663b5da10be1f3f33a2729e4b3605fb5e13b4d6 Changes: https://git.openjdk.org/jdk20/pull/104/files Webrev: https://webrevs.openjdk.org/?repo=jdk20&pr=104&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8299498 Stats: 22 lines in 7 files changed: 0 ins; 0 del; 22 mod Patch: https://git.openjdk.org/jdk20/pull/104.diff Fetch: git fetch https://git.openjdk.org/jdk20 pull/104/head:pull/104 PR: https://git.openjdk.org/jdk20/pull/104