Changes discussed with <@UD8MA0KV2> are in `master...

# spring

[sdeleuze]

Changes discussed with @Jonas Bark are in master https://github.com/spring-projects/spring-framework/commit/c5c4ac164b9c942d9e4a539fa55556347b2a14ef