Merge "Add CreatorToken and CreatorTokenInfo" into main