IGNITE-141 merged

[Valentin Kulichenko]

Guys,

I merged IGNITE-141 (marshalling changes) to sprint-2.

Latest commit before merge: ce2fa203798dd2665a18c25172a278de2d3c351a
Latest commit after merge: 697d19997ecb213a4d5b5dd2538dc5d636e459f5

--
Val