chore: merging TokenWithRefunds
with Token
#8042
Merged
TokenWithRefunds
with Token
#8042