Continuation from https://github.com/spring-projects/spring-boot/pull/28498 New PR, rebased and with the latest changes.

Comment From: snicoll

@cruftex there's no need to create a new PR. You can rebase your existing branch and push force it to update the existing PR.