Supersedes #41713
Comment From: ukmastercom
HI, Raised a PR: https://github.com/spring-projects/spring-boot/pull/41904