Forward-port of #13155

Comment From: marcusdacoregio

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