Forward port of #13776

Comment From: marcusdacoregio

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