Merge in changes from trunk (bug fixes)
Authored by: david_costanzo 2020-02-02
Parent: [r5108]
Child: [r5110]