Backport of gh-25690

Comment From: spring-projects-issues

Fixed via 2281e421915627792a88acb64d0fea51ad138092

Comment From: spring-projects-issues

Fixed via a63c8886c00f30fea5b25f50ddf6f56c6eb957bd