Forward port of issue #13870

Comment From: marcusdacoregio

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