Forward port of issue #24103 to 2.4.x.

Comment From: snicoll

See https://github.com/spring-projects/spring-boot/issues/24103#issuecomment-724559372