encode some of the general delimiters
fix broken test
Merge branch 'next' into next_2.10