Merged latest changes from rel/streaming_client
3 files changed