Forward port of issue https://github.com/spring-projects/spring-security/issues/13408 to 6.1.x

Comment From: marcusdacoregio

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