Forward port of #13368

Comment From: marcusdacoregio

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