Merge branch 'bugfix/collatex-tokenization' into 'develop'

Bugfix/collatex tokenization

See merge request !198
11 jobs for develop in 7 minutes and 13 seconds (queued for 6 seconds)