Merge "Dont commit by commit char if we cant tokenize." into jb-dev