Merge "Fix missing creator token error" into main