Merge to main after updating oidc to oidc-ts.

Stefan Schorkmeierrequested to merge
develop_stefan into master

Mainly a clean up, because for some reason we get quite a few merge conflicts.

Edited by Stefan Schorkmeier

Merge request reports