Backport of gh-24479

Comment From: spring-projects-issues

Fixed via 0d7494ac52e38ab4b5fbd4073506edd8e46f7624

Comment From: spring-projects-issues

Fixed via 17117bd21adae1e4cb7cfb3219db35a6a987c55f