* Cherry-pick #20338 to version-2026.2 (with conflicts)
This cherry-pick has conflicts that need manual resolution.
Original PR: #20338
Original commit: e056dbdadd
* Fix conflict
* Fix conflicts
---------
Co-authored-by: Dominic R <dominic@sdko.org>
Co-authored-by: dewi-tik <dewi@goauthentik.io>