Backport of #10956

Comment From: marcusdacoregio

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