Merge branch 'hotfix/2.1.12'
Should check with correct Token type before fetching data.
Revamp ClientToken, implement ClientInterface directly.
Revamp AccessTokenToken, implement AccessTokenInterface directly.
Merge branch 'hotfix/2.1.13' into develop