Forward port of https://github.com/spring-projects/spring-security/pull/14098 into 6.1.x

Comment From: marcusdacoregio

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