Forward port of #13861

Comment From: marcusdacoregio

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