Forward port of issue #28133 to 2.5.x.

Comment From: wilkinsona

Duplicates https://github.com/spring-projects/spring-boot/issues/28134.