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/3efea5d552f008d082b45950716cae736b9c3a3c