Revert "Project inclusive tokenizer"

This reverts commit 74fec7c82e8a2924544b7ac23a0ad06ac6f7d317.
Revert "Revert "Project inclusive tokenizer""

This reverts commit f3f74206e13b1e043d495ed4b4d0b0c71bf0cfa4.
Merge remote-tracking branch 'origin/master'