Merge in changes from trunk to OPENAPPEND.
Authored by: david_costanzo 2020-06-22
Parent: [r5307]
Child: [r5309]