Merge in changes from trunk, mostly to get CFileStream refactoring
Authored by: david_costanzo 2020-02-02
Parent: [r5103]
Child: [r5105]