Integrate changes from trunk, which were made to make porting to Unicode easier.
Authored by: david_costanzo 2019-05-31
Parent: [r4938]
Child: [r4940]