[#102] PayloadRefactor. Upmerge of trunk
upmerged trunk into branches/refactorpayload
Craeted Feature branch for Refactor Payload