v3.17
Handle both int and str types in grammar char processing
Better HF grammar implementation (#4953)