Merge "Fix missing token issue" into main