Forward-port of #13155

Comment From: marcusdacoregio

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