Backport of gh-23844

Comment From: spring-projects-issues

Fixed via 05d767b1cf5062628f1043f4a34e610024a6c349

Comment From: spring-projects-issues

Fixed via 05d767b1cf5062628f1043f4a34e610024a6c349