Fixed bug introduced by read repair on tokens.
Merge branch 'test' into dev