Merge pull request #4112 from befika/sem-197-problem-pocketid-oidc-provider