Forward port of https://github.com/spring-projects/spring-security/pull/11827

Comment From: marcusdacoregio

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