Fix token for ps1.5 too
Merge branch 'ecommerce_platform'