Resolve #3421350 "Token"

Closes #3421350

added 3 commits

• 25084b85...04b5f436 - 2 commits from branch project:2.0.x
• 0b6c8b18 - Merge branch '2.0.x' into '3421350-token'

Compare with previous version

closed