Merge "[DO NOT REVERT] Migrating remaining token values to new GM3" into main