Closes https://github.com/keycloak/keycloak/issues/22383
Closes https://github.com/keycloak/keycloak/issues/21927