Expand char token processings
disable reprocess the token expansion
Replace CHAR rules by TEXT rules
auto-merge staging into master