Backport of #10956

Comment From: marcusdacoregio

Closed via https://github.com/spring-projects/spring-security/commit/1959c25a03553a28cb196578f87d1adabb9d2e0a