Backport of gh-9387

Comment From: spring-projects-issues

Fixed via 7cab7b06c51ea885dd0d07ff26b135dd3afce1d1

Comment From: spring-projects-issues

Fixed via e2121532a2f86a379c3cd6f6e4bf7bd014311a9d