Merge marshalling 2.0