Merge in changes from trunk (mostly updates to file tests and docs)
Authored by: david_costanzo 2020-03-29
Parent: [r5150]
Child: [r5152]