upmerged trunk into branches/refactorpayload
Authored by: i-campbell 2021-03-07
Parent: [r813]
Child: [r815]