Merge in changes from trunk (to get updates to file.lgo)
Authored by: david_costanzo 2020-03-21
Parent: [r5137]
Child: [r5139]