[JDK-8349084](https://bugs.openjdk.org/browse/JDK-8349084)
------------- Commit messages: - Backport 2f2f7cf0dddd82f11d6dfc4f8a5401ec1c5629dc Changes: https://git.openjdk.org/jdk/pull/23473/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=23473&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8349084 Stats: 2535 lines in 3 files changed: 2 ins; 1982 del; 551 mod Patch: https://git.openjdk.org/jdk/pull/23473.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/23473/head:pull/23473 PR: https://git.openjdk.org/jdk/pull/23473
