(cherry picked from commit 3bb7c65c942c17f2b5a0a2efe2923f26c5ceebd2)
Token
TokenOIDC
restored messages