This pull request contains a backport of commit [1ae85138](https://github.com/openjdk/jdk/commit/1ae851387f881263ccc6aeace5afdd0f49d41d33) from the [openjdk/jdk](https://git.openjdk.org/jdk) repository.
The commit being backported was authored by Paul Sandoz on 2 Feb 2024 and was reviewed by Maurizio Cimadamore and Jatin Bhateja. ------------- Commit messages: - Backport 1ae851387f881263ccc6aeace5afdd0f49d41d33 Changes: https://git.openjdk.org/jdk22/pull/109/files Webrev: https://webrevs.openjdk.org/?repo=jdk22&pr=109&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8324858 Stats: 248 lines in 39 files changed: 132 ins; 8 del; 108 mod Patch: https://git.openjdk.org/jdk22/pull/109.diff Fetch: git fetch https://git.openjdk.org/jdk22.git pull/109/head:pull/109 PR: https://git.openjdk.org/jdk22/pull/109