Backport of gh-25017

Comment From: spring-projects-issues

Fixed via 436e9d8cdc6f247ed0aa7b1618279df024a8dad6

Comment From: spring-projects-issues

Fixed via f474595dee8c8791c983f56baf107b2d2dab822d