Backport of gh-25690

Comment From: spring-projects-issues

Fixed via aec3a4c69e02d87f87258b0ab5c1d6c83f4cb44f

Comment From: spring-projects-issues

Fixed via 26141b0d56f8220b293a0fc845a9818c849c9827