Merge "Add creator token optimization" into main