MODE-2294: Prevent unnecessary serialization
Merge pull request #1248 from okulikov/MODE-2294

MODE-2294: Make server side classes serializable