Merge in changes from trunk.
This was done to get the changes that pass a stream to po_helper.
Authored by: david_costanzo 2019-11-12
Parent: [r5043]
Child: [r5045]