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

Comment From: jzheaux

Closed in 746464e035509a78a55afb1565e6d0489d63b839