Merge "Fix check creator token" into main