Avoid conditional switching
tokenizer
auto-merge staging into master