Backport of gh-25690

Comment From: spring-projects-issues

Fixed via 2f75212eb667a30fe2fa9b5aca8f22d5e255821f

Comment From: spring-projects-issues

Fixed via bdcb189e50ec3280231d8b5431d3e13ea018c608