fix token migration
merge with origin