Forward port of #13871

Comment From: marcusdacoregio

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