Forward port of #14101 into main

Comment From: marcusdacoregio

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