Forward port of #13155

Comment From: marcusdacoregio

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