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