[dcs] Add tokenization and tests
[dcs] stash
Merge branch 'dcs-master' into dcs-stash
[dcs] stash
Merge branch 'dcs-master' into dcs-stash
[dcs] Add tokenization