Merged trunk into my branch. Lots of errors, as the Payload Struct and PayloadMetric Struct were deprecated [#11]
Authored by: i-campbell 2020-05-05
Parent: [r100]
Child: [r102]