Forward port of issue #13314 to 6.1.1.

Comment From: marcusdacoregio

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