Fix FOLD of string concatenations.
Merge branch 'v2.1' into v2.1-agentzh