Merge in changes from trunk (mostly to resolve conflicts)
Authored by: david_costanzo 2019-11-15
Parent: [r5050]
Child: [r5052]