Fix double handling in collect_tokens
#129346
+196
−174
Merged
Loading