Merge "Revert "Add CreatorToken and CreatorTokenInfo"" into main