If possible back patch the changes for https://github.com/spring-projects/spring-boot/issues/26126 to older versions of spring-boot (2.4.x, 2.3.x, ...).
Comment From: snicoll
@jaminh going forward please do not open a PR and an issue for the same thing. We don't need PRs for backports either. The fix in 2.5.x only was intentional.