Resolved Merge conflicts - Build breaks
Implemented sender side marshalling for Get, Set and List