Backport of #32436

Comment From: snicoll

Closed by https://github.com/spring-projects/spring-framework/commit/17650e074137e95bac57c3de4c778d3e0b47d7d6