Forward port of issue #19046 to 2.3.0.M1.

Comment From: wilkinsona

Superseded by https://github.com/spring-projects/spring-boot/issues/19268.