This pull request contains a backport of commit [12d7e618](https://github.com/openjdk/jdk/commit/12d7e6186622506cb19aad0e3d9e9256531e2851) from the [openjdk/jdk](https://git.openjdk.org/jdk) repository.
--------- - [x] I confirm that I make this contribution in accordance with the [OpenJDK Interim AI Policy](https://openjdk.org/legal/ai). ------------- Commit messages: - Backport 12d7e6186622506cb19aad0e3d9e9256531e2851 Changes: https://git.openjdk.org/jdk/pull/31615/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=31615&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8385927 Stats: 529 lines in 43 files changed: 270 ins; 96 del; 163 mod Patch: https://git.openjdk.org/jdk/pull/31615.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/31615/head:pull/31615 PR: https://git.openjdk.org/jdk/pull/31615
