STREAMS-135 | Reduced number of serialization/deserialization steps