Forward port of issue #28725 to 2.6.x.

Comment From: wilkinsona

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