Integrate latest changes from trunk into the unicode branch.
Authored by: david_costanzo 2019-06-02
Parent: [r4947]
Child: [r4949]