Updated tokenizer error data
auto-merge staging into master