Backport of gh-26896

Comment From: spring-projects-issues

Fixed via 9523f1ffd640bda102d204cb9a23408fdc088b4a

Comment From: spring-projects-issues

Fixed via 9523f1ffd640bda102d204cb9a23408fdc088b4a