Backport of gh-25789
Comment From: spring-projects-issues
Fixed via 5b4f3e871f6ad811ecba9cbbe90ac8788a9d3380
Comment From: spring-projects-issues
Fixed via f4eefc62c115d1b20412e40da5f1c4b451374483
Backport of gh-25789
Comment From: spring-projects-issues
Fixed via 5b4f3e871f6ad811ecba9cbbe90ac8788a9d3380
Comment From: spring-projects-issues
Fixed via f4eefc62c115d1b20412e40da5f1c4b451374483