Backport of gh-25783

Comment From: spring-projects-issues

Fixed via c275989323d8f1802741ed101795c320547ac1a7

Comment From: sbrannen

Fixed via 9486ece0d83ec03b25eadc3286e56e9da9dc69bd