Merge branch 'hotfix/2.1.4'
Remove legacy debug_token related.
Merge branch 'hotfix/2.1.5' into develop