Backport of gh-32317

Comment From: sbrannen

Fixed via 380f5d5ea470782d2025aef770c4e1c1237471dc

Comment From: sbrannen

Reopening, awaiting community feedback.

See https://github.com/spring-projects/spring-framework/issues/32317#issuecomment-1964819639 for details.

Comment From: sbrannen

Fixed via 464fa7ea0e1e46323a407819c16e5e656bfea997