Ingrate the "unicode" feature branch into trunk.
Authored by: david_costanzo 2020-07-04
Parent: [r5330]
Child: [r5332]