Forward port of https://github.com/spring-projects/spring-security/issues/14165

Comment From: jzheaux

Closed in 59588281134c8cfafb8986846034d77cb90d1f78