Merge branch 'hotfix/2.1.1'
Remove legacy debug_token related.
Merge branch 'hotfix/2.1.2' into develop