[#102] PayloadRefactor. Upmerge of trunk
Authored by: i-campbell 2021-03-13
Parent: [r825]
Child: [r827]